Thomas S Hatch
0e707080dd
Merge pull request #6931 from madduck/reclass-adapter-top-minion-id-fix
...
reclass_adapter: extract minion_id and pass to top()
2013-08-28 09:38:26 -07:00
Thomas S Hatch
534362eefa
Merge pull request #6937 from d--j/patch-1
...
`cmd.mod_watch` does not check for required func paramter for `call`
2013-08-28 09:37:44 -07:00
Thomas S Hatch
4065679c4c
Merge pull request #6933 from ranl/develop
...
hosts module and state fix
2013-08-28 09:35:52 -07:00
Daniel Jagszent
87ee665c2f
Better error checking in cmd.mod_watch for call
...
`cmd.call` needs two parameters, `name` and `func`. mod_watch now checks for the second required parameter `func` also.
2013-08-28 17:55:39 +02:00
Joseph Hall
16964f9128
Merge pull request #6924 from s0undt3ch/hotfix/tests-temp-dirs
...
Fix missing import
2013-08-28 07:22:03 -07:00
Pedro Algarvio
25a72358ab
Skip this test until properly mocked.
2013-08-28 15:21:29 +00:00
Pedro Algarvio
57feb4a015
One more missing import
2013-08-28 15:21:29 +00:00
Pedro Algarvio
5ea856c104
Fix missing import
2013-08-28 15:21:29 +00:00
ranl
61573b1394
when an ip has more than 1 aliases they will be written at the same line in the hosts file
2013-08-28 14:32:39 +03:00
ranl
d407e5412b
doc fix in host state
2013-08-28 13:59:00 +03:00
martin f. krafft
a4865f8ea2
Extract minion_id and pass to top()
...
Contrary to previous information, the master_tops interface *expects*
the data to be limited to states applicable to a specific minion.
Therefore, the minion ID needs to be provided to reclass. As the
minion_id is currently not part of the master_tops interface, it needs
to be extracted from kwargs, see Salt issue #6930 .
Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-08-28 10:24:48 +02:00
Thomas S Hatch
5292f4b1f1
Fix #6764
2013-08-27 17:55:21 -06:00
David Boucha
95e692d0d0
Merge pull request #6926 from jacksontj/develop
...
Fix typo
2013-08-27 16:27:02 -07:00
Thomas Jackson
7f3a5eed54
Fix typo
2013-08-27 16:22:23 -07:00
Thomas S Hatch
cbc6a8a94b
catch trace in ps module virtual function
2013-08-27 16:40:38 -06:00
Thomas S Hatch
96102e7e12
Merge pull request #6923 from jacksontj/develop
...
Fix for compound command and glob tgt not being a string
2013-08-27 15:10:37 -07:00
Thomas Jackson
641c5aa29f
Merge branch 'develop' of github.com:jacksontj/salt into develop
2013-08-27 15:07:14 -07:00
Thomas Jackson
6e764f5ce5
Add support for compound functions in client_acl_blacklist
2013-08-27 15:05:37 -07:00
Thomas S Hatch
dbfcf6d365
fix location of master pki_dir
2013-08-27 09:56:51 -06:00
Thomas S Hatch
8baee9f646
Merge pull request #6921 from ranl/tomcat6_support
...
Tomcat6 support
2013-08-27 08:37:35 -07:00
Thomas S Hatch
9128706e21
Merge pull request #6919 from s0undt3ch/hotfix/tests-temp-dirs
...
Make sure every temp dir created on the unittests respects, `integration.SYS_TMP_DIR`
2013-08-27 08:37:11 -07:00
David Boucha
20c35fcf22
Merge pull request #6918 from madduck/reclass-docs-update
...
Update reclass_adapter documentation
2013-08-27 08:36:39 -07:00
Thomas S Hatch
0542eade3d
Merge pull request #6915 from s0undt3ch/features/improve-packaging
...
Store salt related path configurations in the `distribution` object
2013-08-27 08:35:41 -07:00
Thomas S Hatch
78e9887a72
Merge pull request #6888 from terminalmage/issue6886
...
Fix tracebacks when prefix not specified.
2013-08-27 08:35:13 -07:00
Pedro Algarvio
2b64d0482d
Make sure every temp dir created on the unittests respects, integration.SYS_TMP_DIR
2013-08-27 15:31:58 +00:00
ranl
0d13fa339a
fixing url6 init
2013-08-27 18:08:46 +03:00
martin f. krafft
dccc87b34a
Update reclass_adapter documentation
...
Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-08-27 16:14:29 +02:00
Pedro Algarvio
bf79341472
Add missing new line at the end of the file.
2013-08-27 09:44:34 +00:00
Pedro Algarvio
8ff77e7feb
Remove trailing white-sapce.
2013-08-27 09:44:34 +00:00
Pedro Algarvio
eb1db5c010
Store salt related path configurations in the distribution object. Fixes #6906 .
...
Added `srv_root_dir` to the paths to check.
2013-08-27 08:46:26 +00:00
Thomas Jackson
0bc4d423bf
Add check for glob_match to make sure the tgt is a string
2013-08-26 20:49:55 -07:00
Thomas S Hatch
6b3b047980
Merge pull request #6911 from UtahDave/fix_pillar
...
Fix pylint warning about {} in argument default.
2013-08-26 15:33:42 -07:00
Thomas S Hatch
71ed0c7de6
Clean up single quotes and the lines are too long
...
This still needs some style love
2013-08-26 16:07:07 -06:00
David Boucha
2ad1593d89
Send {} if grains is None
2013-08-26 16:03:26 -06:00
Thomas S Hatch
fae7ea2593
Fix fad method call and bad default arg
2013-08-26 16:02:03 -06:00
David Boucha
994015d82d
Use None, not empty dict in function definition
2013-08-26 16:01:01 -06:00
Thomas S Hatch
7b60ef8698
doh!
2013-08-26 15:56:32 -06:00
Thomas S Hatch
d0b11f3f0d
Merge pull request #6909 from shadowfax-chc/hgfs-docs
...
Added reference docs for hgfs.
2013-08-26 14:52:35 -07:00
Thomas S Hatch
8eb4e0049d
Merge pull request #6910 from dlanderson/fix_syspath
...
Fix LOGS_DIR path - 'ROOT_DIR/var/log/salt', not 'ROOT_DIR/var/logs/salt...
2013-08-26 14:52:15 -07:00
David Anderson
60a7797f42
Fix LOGS_DIR path - 'ROOT_DIR/var/log/salt', not 'ROOT_DIR/var/logs/salt'
2013-08-26 15:48:43 -06:00
Thomas S Hatch
9425a8a97e
Make the publisher high water mark configurable
2013-08-26 15:44:27 -06:00
shadowfax-chc
ae3d936644
Added reference docs for hgfs.
2013-08-26 17:42:52 -04:00
Thomas S Hatch
10690247c2
Merge pull request #6907 from shadowfax-chc/hgfs-bookmarks
...
Added bookmark support to hgfs.
2013-08-26 14:34:59 -07:00
Thomas S Hatch
b2248c955a
Merge pull request #6889 from laroche/develop
...
fixed preun/postun scripts for salt-minion for the Red Hat .spec file
2013-08-26 14:33:52 -07:00
shadowfax-chc
70cf5862f6
Added bookmark support to hgfs.
...
Added new option to hgfs ``hgfs_branch_method``. If set to ``branches``,
bookmarks will be ignored. If set to ``bookmarks`` branches will be
ignored. If set to ``mixed`` both will be used.
2013-08-26 17:27:38 -04:00
Thomas S Hatch
45f816c082
Take the id out of the auth sign in
...
This should fix #4617 but needs more testing
2013-08-26 14:04:38 -06:00
Florian La Roche
d9e11967a0
fixed preun/postun scripts for salt-minion for the Red Hat .spec file
2013-08-26 21:12:08 +02:00
Thomas S Hatch
69e96a1976
Merge branch 'develop' of git://github.com/foxx/salt into foxx-develop
...
Conflicts:
salt/utils/timed_subprocess.py
2013-08-26 11:36:45 -06:00
David Boucha
51fae7a624
Merge pull request #6903 from UtahDave/develop
...
Add doc showing how to install a Salt Master
2013-08-26 10:29:54 -07:00
David Boucha
39d00fab81
Add doc showing how to install a Salt Master
2013-08-26 11:27:50 -06:00
