valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,494 Commits 24 Branches 182 Tags 341 MiB
0c2bd4b66b
Commit Graph

69494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
0c2bd4b66b Merge pull request #36538 from clinta/daemon-reload 
daemon-reload on call to service.avaliable
 2016-09-29 11:28:00 +09:00
Mike Place
d8a61eb9f6 Merge pull request #36616 from cro/zypper_fix_test 
Zypper fix test
 2016-09-29 11:26:22 +09:00
Mike Place
ccd92d22d2 Merge pull request #36621 from terminalmage/fix-shadowed-builtins 
Fix shadowed builtins
 2016-09-29 11:25:54 +09:00
Mike Place
24f82b2809 Merge pull request #36636 from rallytime/bp-36618 
Back-port #36618 to 2016.3
 2016-09-29 11:23:09 +09:00
Mike Place
750ff8220c Merge pull request #36648 from jfindlay/arch_test 
Integration tests for archive execution module
 2016-09-29 11:16:54 +09:00
Mike Place
91aa464d5d Merge pull request #36650 from saltstack/revert-36389-pr-36386 
Revert "Pr 36386"
 2016-09-29 11:11:15 +09:00
Justin Findlay
cc4d958557 modules.archive: add integration tests 2016-09-28 17:14:52 -06:00
C. R. Oldham
ab5c0e9e65 Merge pull request #36646 from rallytime/fix-36304 
Provide an error message when invalid transport is set
 2016-09-28 16:52:11 -06:00
C. R. Oldham
b618a5c07d Remove debugging 2016-09-28 16:26:56 -06:00
Nicole Thomas
33ef5bffe6 Revert "Pr 36386" 2016-09-28 15:51:48 -06:00
Nicole Thomas
6d9b28506c Merge pull request #36635 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-28 15:10:25 -06:00
Justin Findlay
99bf89447b modules.archive: add opts arg to g(un)zip 2016-09-28 15:06:03 -06:00
Justin Findlay
c1219e68c5 modules.archive.unzip: depend on zipfile module 2016-09-28 15:06:03 -06:00
Justin Findlay
315b031de9 modules.archive: use less redundant message 2016-09-28 15:06:03 -06:00
Clint Armstrong
833beb9b36 Merge pull request #1 from terminalmage/pr-36538 
Move check for service availability to a helper function
 2016-09-28 16:42:13 -04:00
Erik Johnson
c4060ba2c1 Move check for service availability to a helper function 
This allows for us to check for unit file changes at the beginning of
the available() function without invoking the available() function a
second time, potentially resulting in a recursive loop if not handled
delicately.
 2016-09-28 15:29:25 -05:00
rallytime
ae021d6dec Provide an error message when invalid transport is set 
Fixes #36304
 2016-09-28 13:58:06 -06:00
rallytime
787c1f557e Pylint fix 2016-09-28 10:20:18 -06:00
Erik Johnson
62729eff8d Update tests to include fix for renamed function 2016-09-28 11:00:33 -05:00
Yaroslav Molochko
275845c3d2 Fix memory leak for 0mq transport 
In case anyone is trying to "DDOS" zeromq transport with TCP messages,
we've got ZeroMQPubServerChannel process utilized more than 8GB of RAM.
With this patch, we have got ZeroMQPubServerChannel stabilized at 300MB
for > 500 nodes.
It doesn't affect performance for 0mq minions, as it perform gc.collect
only in case of exception.
 2016-09-28 09:11:55 -06:00
rallytime
da574e5b03 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/runners/thin.py
 2016-09-28 09:01:24 -06:00
Mike Place
f0d561a229 Merge pull request #36632 from isbm/isbm-thin-modules-config-15.8 
Configure thin/min modules permanently
 2016-09-28 22:21:11 +09:00
Mike Place
83da81cdfd Merge pull request #36620 from rallytime/fix-36553 
Don't allow mercurial states to return True with errors
 2016-09-28 14:50:50 +09:00
Mike Place
1c001d0ee1 Merge pull request #36622 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-28 14:39:43 +09:00
Erik Johnson
283aca8f2a Update test to reflect new function signature 2016-09-27 23:13:19 -05:00
Mike Place
e7def534b1 Merge pull request #36520 from twangboy/fix_cmd.script_runas 
Fix cmd.script runas for Windows
 2016-09-28 13:07:00 +09:00
rallytime
90c66ef756 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/service.py
 2016-09-27 21:34:10 -06:00
rallytime
a828bdd0b8 Update test mocks for cmd.run_all dicts 2016-09-27 20:55:39 -06:00
Erik Johnson
0f158b5edd Fix shadowed builtins 
id, hex, and list were all shadowed, this commit fixes that.
 2016-09-27 21:53:32 -05:00
Mike Place
798bf3086b Merge pull request #36564 from DSRCorporation/bugs/32368_grains_match_bug 
Improve and fix `_check_cache_minions`
 2016-09-28 11:50:54 +09:00
Mike Place
133705d567 Merge pull request #36606 from danlsgiga/consul_pillar_token 
Add support for ACL Tokens in consul_pillar with the option consul.token
 2016-09-28 11:46:03 +09:00
Mike Place
9b9e167b47 Merge pull request #36562 from kiorky/s2015.8 
Fix pkg.latest_version using localized output
 2016-09-28 11:43:38 +09:00
Mike Place
4ab52ae0f6 Merge pull request #36607 from vutny/detect-service-fail 
`salt.states.service`: detect that service failed to start/stop
 2016-09-28 11:39:51 +09:00
Mike Place
5de036b56c Merge pull request #36611 from multani/2015.8 
jinja: fix YAML terminator removal in Jinja's "yaml" filter
 2016-09-28 11:36:21 +09:00
Mike Place
b365f1e34d Merge pull request #36613 from slinn0/2016.3_36588_fixes 
Remove file.check_managed_changes  when not needed (backport of PR #36589 to 2016.3)
 2016-09-28 11:35:56 +09:00
rallytime
3904dfc5a8 Don't allow mercurial states to return True with errors 
Fixes #36553

The hg.present state was not checking for errors for any of the calls
to the hg.py execution module functions. All of the hg.py execution
module functions were using cmd.run, instead of cmd.run_all, which
allowed for hg.py execution module functions to log an error at the CLI
but the hg.present state would return True, even though there were
problems executing the module functions.

This change adds try/except blocks around the calls to the mercurial
execution module functions and retuns False when a CommandExecutionError
is raised by the module. The module has been changes to use cmd.run_all
instead of cmd.run in order to check for the retcode of the underlying
mercurial calls and raises a CommandExecutionError is the retcode != 0.
 2016-09-27 17:29:47 -06:00
Dmitry
be61f97db3 Minor: syntax error fixes. 2016-09-28 00:23:46 +03:00
C. R. Oldham
3870589462 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere 2016-09-27 14:50:44 -06:00
C. R. Oldham
867638ff48 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere 2016-09-27 14:49:23 -06:00
Dmitry Kuzmenko
29660ed672 Improve and fix _check_cache_minions 
Don't match minion if it's not in the output list.
Don't check the minion existence in the list where we know it's there.
Simplify the code (as for me...)
 2016-09-27 23:28:15 +03:00
Nicole Thomas
e23af98d97 Merge pull request #36609 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-27 12:34:22 -06:00
Jonathan Ballet
79fdc12395 jinja: fix YAML terminator removal in Jinja's "yaml" filter 2016-09-27 18:52:49 +02:00
elainearbaugh
6e36191fc4 Fix trust key 2015.8 (#36540) 
* Fix gpg.trust_key user bug

* Separated user and no user case
 2016-09-27 10:28:28 -06:00
rallytime
f15d4a38bd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/pkg.py
 2016-09-27 10:15:16 -06:00
Steve Linn
d9da5cb2d4 Backport of PR #36589 / Issue #36588 to 2016.3 branch. 2016-09-27 08:43:21 -07:00
Denys Havrysh
c4f899b3b3 salt.states.service: detect that service failed to start/stop 2016-09-27 18:24:37 +03:00
Daniel Santos
a5907c9c89 Add support for ACL Tokens in consul_pillar with the option consul.token 2016-09-27 09:05:52 -06:00
Bo Maryniuk
975f8bb27d Add extra-mods options to the Salt-Thin via SSH CLI 2016-09-27 11:12:18 +02:00
Bo Maryniuk
a441b35588 Add documentation about Salt Thin configuration 2016-09-27 11:12:07 +02:00
Bo Maryniuk
3bfb17ee62 Add a description of the thin/min parameters to the master config 2016-09-27 11:06:43 +02:00