Commit Graph

31294 Commits

Author SHA1 Message Date
Erik Johnson
dcaf2892f3 Clarify GitPython installation in gitfs tutorial 2014-06-03 10:40:27 -05:00
Thomas S Hatch
f2808f29fc Merge pull request #13170 from UtahDave/win_restart
Use powershell, when available, to restart a service.
2014-06-02 12:52:18 -06:00
Thomas S Hatch
8318a48a8e Merge pull request #13169 from garethgreenaway/adding_simple_file_dot_write
Additions to file module
2014-06-02 12:51:50 -06:00
David Boucha
460d6d7776 specify powershell 2014-06-02 12:10:26 -06:00
David Boucha
dfd3bab1d0 Use powershell to restart a service.
This should allow for Salt to retstart itself.
2014-06-02 12:03:22 -06:00
Thomas S Hatch
91c0955cfc Merge pull request #13168 from techhat/postfix
Add new postfix module
2014-06-02 11:08:45 -06:00
Gareth J. Greenaway
d0f3f315e8 Adding a very simple function to write provided contents to a file, overwriting existing contents. 2014-06-02 09:56:39 -07:00
Thomas S Hatch
3acb52b753 lint 2014-06-02 10:38:21 -06:00
Joseph Hall
e0b2428f5a Add new postfix module 2014-06-02 10:20:58 -06:00
Thomas S Hatch
f839cb6d35 don't import stdlib funcs into state modules 2014-06-02 10:16:06 -06:00
Thomas S Hatch
fdcaaa4bcb Merge pull request #13165 from nicksloan/absolute_known_hosts
Allow arbitrary absolute path. Error on relative path without user argument.
2014-06-02 10:14:06 -06:00
Thomas S Hatch
e5eb257343 move conditionsl logic and remove parens per lint #13157 2014-06-02 10:09:25 -06:00
Thomas S Hatch
733cc94276 Merge pull request #13157 from bechtoldt/foreman_pillar
implementing a foreman ext_pillar module
2014-06-02 10:08:30 -06:00
Thomas S Hatch
063f084350 Merge branch 'terminalmage-puppet-housekeeping' into develop 2014-06-02 10:03:25 -06:00
Thomas S Hatch
eb8f855e15 Merge branch 'puppet-housekeeping' of https://github.com/terminalmage/salt into terminalmage-puppet-housekeeping
Conflicts:
	salt/modules/puppet.py
2014-06-02 10:03:15 -06:00
Thomas S Hatch
254156691d Lint 2014-06-02 10:00:35 -06:00
Joseph Hall
76164bb7d3 Merge pull request #13164 from mortis1337/varnish-execution-module
Added an execution module for varnish
2014-06-02 09:41:28 -06:00
Erik Johnson
2cfbc820a0 Merge pull request #13161 from s0undt3ch/develop
Json is not going through serializers anymore. Refs #13158
2014-06-02 10:34:18 -05:00
Erik Johnson
b2d17f5cbf Merge pull request #7 from mfournier/os.kill-fix
fix mistake mentioned in #13162
2014-06-02 10:04:26 -05:00
Nick Sloan
292e97a92e Fixed moved uinfo. 2014-06-02 10:19:43 -04:00
Nick Sloan
51eef01545 Return error on relative path without user. 2014-06-02 09:54:24 -04:00
Nick Sloan
c207a51e2a Allow arbitrary absolute path. Error on relative path without user argument. 2014-06-02 09:39:55 -04:00
morten
92c890dfcc fixed trailing whitespaces and stuff pylint complained about. 2014-06-02 15:23:01 +02:00
morten
4dc4de6890 Added an execution module for varnish (https://www.varnish-software.com/) 2014-06-02 13:44:59 +02:00
Marc Fournier
7acb8570cc add missing reference to error message 2014-06-02 10:57:00 +02:00
Marc Fournier
c54ee08917 correct erroneous os.kill() statement 2014-06-02 08:59:04 +02:00
Erik Johnson
bcca77c312 Merge pull request #13160 from mfournier/puppet-modules-improvements-cleanedup
Puppet module: 4 new methods
2014-06-02 00:34:30 -05:00
Pedro Algarvio
13b0869c3a Json is not going through serializers anymore. Refs #13158 2014-06-02 00:42:14 +01:00
Pedro Algarvio
e17027c982 Merge pull request #13158 from terminalmage/issue13137
Fix merge_if_exists in states.file.serialize
2014-06-02 00:27:50 +01:00
Marc Fournier
f203e23663 Fix mistakes pointed out by pylint in 3 previous commits 2014-06-02 01:04:35 +02:00
Marc Fournier
de912065ba Add puppet.summary, extracts various infos out of latest run report 2014-06-02 00:09:38 +02:00
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