valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,363 Commits 24 Branches 182 Tags 341 MiB
023e0bc77d
Commit Graph

31363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Fournier
c9a741d432 Add puppet.status, returning agents state 2014-06-02 00:01:26 +02:00
Marc Fournier
c2da06010d Implement puppet agent enable/disable'ing 2014-06-01 23:43:53 +02:00
Erik Johnson
47cfbd40f4 Cleanup for #13160 
This commit makes the changes from #13160 conform to the Salt way by
kreturning booleans for enable/disable. In addition, it makes the
following changes:

1. Adds versionadded directives

2. Fixes leaked file handles by using with statements (and
   salt.utils.fopen).

3. Raises a CommandExecutionError in ares where the failure of a
   function reaches an error case.
 2014-06-01 13:02:13 -05:00
Joseph Hall
6c1414608e Merge pull request #13159 from s0undt3ch/develop 
Ensure correct syspath
 2014-06-01 10:58:52 -06:00
Joseph Hall
5a9d8226cb Merge pull request #13153 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #69
 2014-06-01 10:56:37 -06:00
Pedro Algarvio
af503bfdcf Skip test if unable to import the git python package 2014-06-01 07:05:52 +01:00
Pedro Algarvio
7e11871d9f Ensure correct syspath 2014-06-01 06:55:52 +01:00
Erik Johnson
15dbde5c3d Fix merge_if_exists in states.file.serialize 
This feature was recently added, but about two weeks before it was
added, this state started importing salt.utils.{yaml,json} as yaml/json.
This makes the yaml.load (or json.load) fail since these functions are
not in the serializer modules.

This fixes merge_if_exists by importing the serializer modules for yaml
and json under a different namespace, allowing the yaml and json modules
to also be loaded.

It also makes the change to using yaml.safe_load, and also adds a
versionadded directive for merge_if_exists.
 2014-05-31 22:53:10 -05:00
Arnold Bechtoldt
7ada4abfd7 introducing the foreman ext_pillar module 2014-06-01 05:00:16 +02:00
Pedro Algarvio
d843102cad Update 'doc/.tx/config' - Build #69 
http://cookingwithsalt.org/job/salt/job/transifex/69/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-06-01 00:53:00 +01:00
Thomas S Hatch
e5505b8efb Merge pull request #13148 from jacksontj/develop 
fix for #12641
 2014-05-31 14:12:23 -06:00
Pedro Algarvio
e615c9dd7f Merge pull request #13147 from basepi/brewuser13097 
Don't try to set brew cmd user if we're already the correct user
 2014-05-31 18:09:30 +01:00
Pedro Algarvio
2a4670c9b0 Merge pull request #13145 from zeezooz/iptables_check 
Fix condition, avoid deprecation warning.
 2014-05-31 16:48:31 +01:00
Joseph Hall
a315a5b0c3 Merge pull request #13140 from basepi/openstackdocs13133 
Fix openstack docs so they will format correctly
 2014-05-31 03:11:42 -06:00
Seth House
e8524e001a Merge pull request #13149 from garethgreenaway/develop 
Additions to sysmod.py
 2014-05-30 18:38:34 -06:00
Thomas S Hatch
9490901acc Add missing flag to jobs.lookup_jid 2014-05-30 18:29:00 -06:00
Gareth J. Greenaway
8c1c830ca9 Adding ability to retrieve doc strings for returners and runners. 2014-05-30 16:58:05 -07:00
Thomas Jackson
c613c88fe9 fix for #12641 
dont set __salt__ to self, since lazyloader isn't necessarily execution modules
 2014-05-30 16:04:28 -07:00
Colton Myers
7d08198e86 Don't try to set cmd user if we're already the correct user 2014-05-30 16:30:47 -06:00
Andrew Burdo
c73f6025b2 Fix condition, avoid deprecation warning. 
Find returns -1 if string not found which results in True.
 2014-05-31 00:57:17 +03:00
Colton Myers
10c868c2b1 Fix docs so they will format correctly 2014-05-30 14:38:46 -06:00
Joseph Hall
56326a195e Merge pull request #13136 from bVector/patch-1 
Typo correction
 2014-05-30 12:00:41 -06:00
bVector
198859c44f Typo correction 2014-05-30 10:56:54 -07:00
Thomas S Hatch
9f0c87f300 don't log tons of iptables help messages 2014-05-30 11:52:47 -06:00
Thomas S Hatch
9111626d62 Merge pull request #13135 from UtahDave/fix_math 
Fix metric math example
 2014-05-30 11:31:41 -06:00
David Boucha
83aeb96731 Fix metric math example 2014-05-30 11:15:24 -06:00
Thomas S Hatch
7699ee82fc Merge pull request #13021 from zeezooz/iptables_parse_conf 
Add support for negations in iptables rules, add more arguments.
 2014-05-30 11:13:22 -06:00
Thomas S Hatch
c7cea970dd Merge pull request #13125 from UtahDave/sanitize_strings2 
Replace illegal Windows filename chars from cached file paths
 2014-05-30 11:10:47 -06:00
Thomas S Hatch
2e65202bf2 Merge pull request #13130 from terminalmage/cleanup 
Misc. cleanup in file state/module
 2014-05-30 11:10:09 -06:00
Thomas S Hatch
f455a83acf update to not dep id settign on moster 2014-05-30 11:08:26 -06:00
Thomas S Hatch
ba4cc71a14 fix more sls to yamlex refs 2014-05-30 10:14:47 -06:00
Thomas S Hatch
8b3dabbf7d lint 2014-05-30 09:45:46 -06:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
9bd180644f Merge branch 'johnnoone-serializers-migration' into develop 2014-05-30 09:16:39 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration 
Conflicts:
	salt/pillar/__init__.py
 2014-05-30 09:16:21 -06:00
Thomas S Hatch
84f4fa1430 Merge pull request #13122 from cachedout/test_fixing 
Fix broken tests
 2014-05-30 09:08:53 -06:00
Joseph Hall
b13f8ad2d3 Merge pull request #13131 from felskrone/minions_present_docu 
added section for 'presence_events'
 2014-05-30 08:29:54 -06:00
vs
918502c8fe added section for 'presence_events' 2014-05-30 06:51:03 -07:00
Joseph Hall
f65bfff566 Merge pull request #13128 from s0undt3ch/develop 
PyLint ignore W1111 (assignment-from-none)
 2014-05-30 03:02:57 -06:00
Pedro Algarvio
204ed95c2c PyLint ignore W1111 (assignment-from-none) 2014-05-30 09:38:35 +01:00
Joseph Hall
20e954c3a8 Merge pull request #13127 from s0undt3ch/develop 
Remove trailing white-space.
 2014-05-30 02:11:51 -06:00
Pedro Algarvio
8d78a17a82 Remove trailing white-space. 2014-05-30 09:00:09 +01:00
Pedro Algarvio
a3f36090ec Merge pull request #13108 from s0undt3ch/hotfix/pylint 
This will allow to upgrade to PyLint 1.2.1
 2014-05-30 08:25:20 +01:00
Joseph Hall
9b3373b5e2 Merge pull request #13124 from rallysf/associate-eip-on-eni-create 
Allow association of exiting EIP
 2014-05-30 00:11:57 -06:00
Erik Johnson
1c69a05f16 Misc. cleanup in file state/module 
Single quotes, minor pep8 fixes ("x not in y", instead of "not x in y"),
and clarified a few comments.
 2014-05-29 23:59:01 -05:00
Seth House
796b709d96 Merge pull request #13126 from garethgreenaway/13112_adding_docs_for_states 
Adding the ability to get the __doc__ strings from states
 2014-05-29 19:37:47 -06:00
Seth House
ea7abf0b24 Added cross-link to the minionfs tutorial 2014-05-29 19:26:17 -06:00
Gareth J. Greenaway
7c7096c471 Adding the ability to get the __doc__ strings from states. No argument and all docs are printing, specifying a state shows only the docs for the functions in that state. Specifying the state.function shows only the docs for that state function. 2014-05-29 18:14:26 -07:00
David Boucha
2130eeeb25 fix whitespace errors 2014-05-29 19:06:12 -06:00
David Boucha
b0f93263cc remove debugging print statements 2014-05-29 18:43:54 -06:00