Commit Graph

17468 Commits

Author SHA1 Message Date
Matthew Williams
322b6055b2 docs: lxc and seed modules 2013-09-05 06:24:00 +00:00
Thomas S Hatch
81446d9491 Move to multiprocessing 2013-09-05 00:23:59 -06:00
Matthew Williams
fd170781de add lxc.info function 2013-09-05 06:18:57 +00:00
David Boucha
51194de7f7 add CLI Example so tests pass 2013-09-05 00:17:48 -06:00
Thomas S Hatch
ad9b70a3e8 Merge pull request #7062 from mgwilliams/seed-refactor
refactor seed module -- detect path type: block, dir, or image
2013-09-04 22:46:01 -07:00
Matthew Williams
4c9e1100b9 Merge remote-tracking branch 'origin/develop' into seed-refactor
Conflicts:
	salt/modules/seed.py
2013-09-05 05:44:36 +00:00
Matthew Williams
97508357c6 refactor seed module -- detect path type: block, dir, or image 2013-09-05 05:42:07 +00:00
Thomas S Hatch
27f59f4cb4 improve memory management in ssh contexts 2013-09-04 23:34:34 -06:00
Thomas S Hatch
4d369e7c52 inherit object 2013-09-04 23:00:56 -06:00
Pedro Algarvio
2170af5717 Non zero exit codes should be considered errors. 2013-09-05 05:38:07 +01:00
David Boucha
22a2bf6e04 Merge pull request #7060 from s0undt3ch/develop
Suse user tests fixes
2013-09-04 20:57:17 -07:00
Pedro Algarvio
111171065f Suse based distributions(at least) complain when a username or group starts with digits. 2013-09-05 04:50:51 +01:00
Pedro Algarvio
93c41659c0 Merge pull request #7058 from UtahDave/fix_supervisord_test
Check for each service status individually
2013-09-04 20:45:49 -07:00
Pedro Algarvio
2c6bfcedb7 Make use of the requires_system_grains decorator 2013-09-05 04:43:39 +01:00
Pedro Algarvio
1a2e9be5d4 Adapt test case to Suse based distributions. 2013-09-05 04:39:54 +01:00
David Boucha
5b76394850 Check for each service status individually
In case they self report out of order
2013-09-04 21:37:26 -06:00
Thomas S Hatch
76c1fa878d cleanly handle the local key in the ret 2013-09-04 21:19:37 -06:00
Thomas S Hatch
b655637254 Fix path to salt version tag 2013-09-04 21:07:00 -06:00
Thomas S Hatch
039d5cc1a1 update heredoc to deploy fresh when the master is updated 2013-09-04 20:58:52 -06:00
Thomas S Hatch
dd993a42d1 Merge pull request #7054 from terminalmage/dpkg-selections-refactor
Cleanup/refactor new dpkg selections support
2013-09-04 19:38:52 -07:00
Thomas S Hatch
5c270dbd92 Merge pull request #7056 from s0undt3ch/develop
Fix unwanted TRACE level messages
2013-09-04 19:37:34 -07:00
Pedro Algarvio
a685a05a0c Fix the salt CLI tools version check test case 2013-09-05 03:34:12 +01:00
Pedro Algarvio
944268aba7 Allow the Logstash ZMQ high water mark to be configurable. 2013-09-05 01:45:06 +01:00
Pedro Algarvio
cea30f3617 Don't feed logging handler messages which they're not supposed to handle. 2013-09-05 01:27:37 +01:00
Pedro Algarvio
47f8dc0743 The null logging handler should only output warning level messages. 2013-09-05 01:14:59 +01:00
Pedro Algarvio
410c26c339 Add level passing support to the temporary logging handler. 2013-09-05 01:14:33 +01:00
mickey
79476a243e Corrected some of the dict return changes text 2013-09-04 19:13:30 -05:00
mickey
7332236059 Merge remote-tracking branch 'upstream/develop' into feature_mknod 2013-09-04 18:51:12 -05:00
mickey
be87a43caa Added mknod as a state 2013-09-04 18:48:16 -05:00
Erik Johnson
d7045fa4a9 Cleanup/refactor new dpkg selections support
This builds on the code merged in c2a304c, correcting some style-related
issues, reducing the number of times that get_selections() needs to be
called within set_selections(), and raising the proper exceptions when
invalid input is specified.
2013-09-04 17:55:55 -05:00
Pedro Algarvio
71a15e3702 Merge pull request #7053 from UtahDave/fix_supervisord_test
Test service status separately
2013-09-04 15:24:43 -07:00
David Boucha
3f1498364d Test service status separately
Sometimes the 2 services return in different orders so we'll test for
each one separately
2013-09-04 15:40:50 -06:00
Thomas S Hatch
61605a2a5f don't close the tarball just yet 2013-09-04 15:17:34 -06:00
Thomas S Hatch
5edd851d53 Awrite the correct version 2013-09-04 15:15:20 -06:00
Thomas S Hatch
56c23438c0 Add salt-thin version file 2013-09-04 15:09:27 -06:00
Thomas S Hatch
82f6e478a1 Merge pull request #7051 from whiteinge/jenkins-sls-param
Added sls and pillar as params
2013-09-04 13:52:19 -07:00
Thomas S Hatch
db9d0ae5ab Merge pull request #7050 from VertigoRay/patch-1
return after exception is caught.
2013-09-04 13:51:25 -07:00
Thomas S Hatch
c30d748059 Merge pull request #7038 from SmithSamuelM/develop
Changed name spaced event tag separator from "." to "/' dot to slash
2013-09-04 13:47:34 -07:00
Seth House
1ff3c953e6 Added sls and pillar as params
This change is backward compatible...but untested.
2013-09-04 14:29:41 -06:00
Erik Johnson
c2a304cb13 Merge pull request #6882 from holmboe/dpkg-selections
dpkg selections
2013-09-04 13:11:44 -07:00
David Boucha
52b3031f82 Merge pull request #7049 from s0undt3ch/hotfix/jenkins
Use raw strings in regular expressions. Double to single quotes.
2013-09-04 12:57:29 -07:00
David Boucha
11f11a3358 Merge pull request #7048 from s0undt3ch/issues/7003
SuSE based distributions get the `gid` from `users` not the `gid` from it's name
2013-09-04 12:40:09 -07:00
Raymond Piller
c7a76920e3 return after exception is caught.
Otherwise, it is overwritten after 'returner' is evaluated and set result to True ... which is inaccurate.
2013-09-04 14:14:53 -05:00
Pedro Algarvio
b61fc26498 Use raw strings in regular expressions. Double to single quotes. 2013-09-04 20:12:37 +01:00
Pedro Algarvio
6d446ffa56 Use the requires_system_grains decorator from salt-testing 2013-09-04 20:05:41 +01:00
Pedro Algarvio
38bfa49e53 SuSE based distributions get the gid from users not the gid from it's name. Fixes #7003.
Full explanation about why is this can be seen here:

  https://github.com/saltstack/salt/issues/7003#issuecomment-23813071
2013-09-04 19:41:20 +01:00
David Boucha
f8a086b0a5 Merge pull request #7039 from aboe76/fix_opensuse
updated suse spec file
2013-09-04 11:12:19 -07:00
Niels Abspoel
1c9742d228 updated suse spec file
Fixed non-executable-scripts warning from python checks
2013-09-04 20:07:33 +02:00
Samuel M Smith
2b8d4f61eb Changed name spaced event tag separator from "." to "/' dot to slash to enable
minion ids that are domain names inside tags.
Updated constant delimiter value
Also fixed fileserver tags that were not being created with tagify so that in the future
any changes are automatic.

In general users should use the tagify function to create tags to ensure
correct separators etc.
2013-09-04 12:04:13 -06:00
Thomas S Hatch
63a78186d6 Merge pull request #7029 from ajithhub/base_disk_parse
Parse backing file from qemu-image info output
2013-09-04 10:56:19 -07:00