Commit Graph

6430 Commits

Author SHA1 Message Date
Thomas S Hatch
0b9fe9c8d9 Add the capability to run states when the minion starts 2012-09-20 11:45:03 -06:00
Thomas S Hatch
e66ebc7621 Allow minions to send a return that requests a jid 2012-09-20 11:19:24 -06:00
Thomas S Hatch
d76f051610 dd some more docs making the order to requitie relationship
a little more clear
2012-09-20 09:39:16 -06:00
Thomas S Hatch
075c75425e Change the default sock_dir to /var/run/salt, because that is correct 2012-09-20 09:31:59 -06:00
Aaron Tygart
bf31beac91 Merge branch 'upstream/develop' into windows_multiprocessing 2012-09-19 20:39:26 -05:00
Aaron Tygart
876fb9ec4e Add difflib and distribute to bbfreeze includes 2012-09-19 20:35:14 -05:00
Aaron Tygart
5aee1e7ad9 Add windows support for open file count 2012-09-19 18:06:07 -05:00
Aaron Tygart
4020d45984 Correct non-frozen attempted update error 2012-09-19 18:05:41 -05:00
Thomas S Hatch
0fadfd0bde Merge pull request #2045 from giantlock/develop
Some fixes for freebsdpkg module
2012-09-19 15:58:18 -07:00
Aaron Tygart
fe60027da1 Merge branch 'fh-upstream/develop' into windows_multiprocessing 2012-09-19 17:20:04 -05:00
Aaron Tygart
41bc763e3f Revise returned data for saltutil.update
* Fix bug that would throw exceptions for attempting to uninstall the
   currently running version
2012-09-19 17:11:01 -05:00
Denis Generalov
74398d19fd *) Make install() definition similar with order package modules
*) Handle refresh param in install()
*) Fix upgrade(): freebsd-update does'nt care about packages, it's about OS itself. But there is not easy way to upgrade package with old package system.
*) Fix docstring example in search()
*) Bring the changes above to the man page
2012-09-20 02:05:14 +04:00
Thomas S Hatch
543f7c6bc9 Fix error cause by django module renaming 2012-09-19 14:52:36 -06:00
Thomas S Hatch
2dc5ebb80e Fix event test with the change in master events returning a dict 2012-09-19 14:42:48 -06:00
Thomas S Hatch
6de9939768 Fix another test for new hased minion ids 2012-09-19 14:39:01 -06:00
Thomas S Hatch
a3e7a3a7af fix test based on new minion event socket names 2012-09-19 14:21:56 -06:00
Thomas S Hatch
2b8320eb49 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-19 13:24:23 -06:00
Thomas S Hatch
3a0a4125d6 Change the socket to use a hash of the minion id 2012-09-19 13:23:55 -06:00
Thomas S Hatch
07fdb35cd7 Merge pull request #2043 from gekitsuu/develop
Made the docstring a bit clearer about the format of the key. Commonly
2012-09-19 10:46:37 -07:00
Adam Glenn
a7745b4578 Made the docstring a bit clearer about the format of the key. Commonly
if you are copying this from our .ssh/id_rsa.pub you will have the
type of key and user@host at the beginning and end of the key. The
"Invalid" message returned from set_auth_key isn't clear about why
the key is invalid, or that it's the key specifically it's complaining
about and not the user, type, or something else if it was passed.
2012-09-19 12:26:20 -04:00
Aaron Tygart
2d77d969d3 Add logging and correct pathing issues on Windows
* Add logging to much of the sls caching stack
* Correct path separator issues on Windows
* Remove unecessary call to jinja's split_template_path
2012-09-18 21:15:29 -05:00
Thomas S Hatch
36b5f5ebb6 Merge pull request #2041 from giantlock/develop
Handle repo argument as described in documentation.
2012-09-18 16:31:41 -07:00
Denis Generalov
50dbc3a3a1 Handle repo argument as described in documentation. 2012-09-19 03:14:14 +04:00
Thomas S Hatch
9a9896858b Merge pull request #2040 from giantlock/develop
fix typo
2012-09-18 15:27:06 -07:00
Denis Generalov
f514bd6851 fix typo 2012-09-19 02:17:18 +04:00
Thomas S Hatch
0cff0e4976 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-18 15:29:00 -06:00
Thomas S Hatch
47d6922548 Allow the minion config to have "allow_undefined" set
We could add the ability to pass the data through from an option
in the state file itself, but this just pulls from the minion config
Fix #2039
2012-09-18 15:21:53 -06:00
Thomas S Hatch
95e5e73226 Merge pull request #2038 from fatbox/fix-django
The addition of the django module breaks using a django app from other modules
2012-09-18 13:38:01 -07:00
Aaron Tygart
0012024c63 Add additional modules for freezing on windows 2012-09-18 15:35:38 -05:00
Evan Borgstrom
815debb318 The addition of the django module breaks using a django app from other modules
We use our Django app's models from within one of our custom salt
modules. Upon a recent upgrade we found that our custom module broke
because our __virtual__ function started returning False.

Since there was a django.py file in the modules it meant that our
attempt to import django.core.management resulted in an ImportError.
2012-09-18 15:41:28 -04:00
Thomas S Hatch
88d5f2bd4d Add finger stuff to 0.10.3 release notes 2012-09-18 12:21:49 -06:00
Thomas S Hatch
7a2d706ec7 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-18 11:20:37 -06:00
Thomas S Hatch
2face129f2 Add master_finger to base opts 2012-09-18 11:20:12 -06:00
Aaron Tygart
488f9faef7 Revise version variable usage for updates 2012-09-18 10:21:26 -05:00
Thomas S Hatch
3e4c902cff Add notes for M2Crypto setup 2012-09-18 00:04:04 -06:00
Thomas S Hatch
695e20a525 Change the master fired events to send the raw load with id,
Fix #2033
2012-09-17 20:01:53 -06:00
Pedro Algarvio
8ab5e6e9c2 Include some test cases to expose saltstack/salt#2028 2012-09-18 01:53:05 +01:00
Pedro Algarvio
33c77d1723 If it's not a dict, it should not be treated like one. 2012-09-18 00:57:05 +01:00
Thomas S Hatch
4115393a48 Add code per #1988 2012-09-17 14:26:59 -06:00
Thomas S Hatch
cbe7d6b61c Merge pull request #2023 from kjkuan/develop
Changes to the service module and state, plus a document update.
2012-09-17 09:27:22 -07:00
Jack Kuan
238a0163f8 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-17 11:28:45 -04:00
Jack Kuan
21785613b9 Add a pid() function to the status module, and refactor the service module and its backends. 2012-09-17 10:56:01 -04:00
Thomas S Hatch
a358885829 Merge pull request #2027 from s0undt3ch/develop
Inform the users about the current max open files situation.
2012-09-16 09:38:59 -07:00
Pedro Algarvio
243edfb9ad Also test for not triggering log messages. Refs #1986. 2012-09-16 16:27:17 +01:00
Pedro Algarvio
969dc01ce1 Skip test on travis-ci environment. Refs #1986. 2012-09-16 16:12:17 +01:00
Pedro Algarvio
b445674d98 Skip test if max open files exception is triggered. 2012-09-16 16:00:36 +01:00
Pedro Algarvio
0fd61050c9 Inform the users about the current max open files situation.
We defined that the amount of accepted keys should be lower than 1/4 of the system's max open file setting. Inform the user about the current situation, the logging level is "attached" to the gravity of the current status.
2012-09-15 15:32:07 +01:00
Pedro Algarvio
7339cd6950 Allow clearing the stored log messages. 2012-09-15 15:28:09 +01:00
Pedro Algarvio
7ffdad770f Minor PEP-8 change. 2012-09-15 15:27:59 +01:00
Pedro Algarvio
b20b05cb41 Add a tests logging handler. Refs #1986.
This is just a simple logging handler which will keep all emitted log messages in a list. This can be used to test if a certain log messages is emitted in a certain scenario. Usage example:

```python
with TestsLoggingHandler() as handler:
    # (...)               Do what ever you wish here
    handler.messages    # here are the emitted log messages
```
2012-09-15 15:27:47 +01:00