valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,131 Commits 24 Branches 182 Tags 341 MiB
869f64b9ca
Commit Graph

44131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niklas Laxström
9efb07eece Fix execution order with "names" 
Fixes #13312. Used fractional parts of floats to ensure correct sort
order. The issue with previous solution to use order + name_order was
that all states come with preassigned order, and thus order + name_order
will match the order of the following states. This solution limits the
maximum value of name_order to 9999 before the same issue arises again.

I don't quite understand why the order_chunks function is duplicated
twice. I updated both instances.
 2015-01-05 14:02:17 -07:00
Mike Place
2e1bfa38b9 Avoid a race between multiple auth requests for a minion key. 
Refs #19061
 2015-01-05 14:00:17 -07:00
Joseph Hall
92744e9541 mapper.opts, not self.opts 2015-01-05 13:46:06 -07:00
Joseph Hall
473dea47f0 Use proper query method from CloudClient 2015-01-05 13:42:39 -07:00
Mike Place
0194fbe77c Attempt to fix inconsintent VT test by preventing a spin 2015-01-05 13:35:02 -07:00
Thomas S Hatch
5fcb74226b Merge pull request #19351 from jfindlay/win_firewall 
win_firewall: fix disable, enable and add delete_rule
 2015-01-05 13:28:44 -07:00
Thomas S Hatch
c43256d5fc Merge pull request #19350 from UtahDave/2014.7local 
Fix thread leak on Windows when using threading.
 2015-01-05 13:28:30 -07:00
Thomas S Hatch
9cc1af7ebc Merge pull request #19347 from mens/patch-1 
Update states/augeas.py. Fix index error.
 2015-01-05 13:27:45 -07:00
Thomas S Hatch
23935b9d04 Merge pull request #19346 from garethgreenaway/19291_pkg_state_version_latest 
Additions to pkg state module
 2015-01-05 13:27:26 -07:00
Thomas S Hatch
3de7cfc415 Merge pull request #19345 from cachedout/django_cleanup 
Catch all Django errors and some PEP8 cleanup.
 2015-01-05 13:27:04 -07:00
Thomas S Hatch
27c539279a Merge pull request #19339 from rynemccall/support-non-ascii-output 
Support messages containing non-ascii characters
 2015-01-05 13:26:40 -07:00
Thomas S Hatch
6f13509cc0 Merge pull request #19341 from Lacrymology/safe-pillar-get 
fix docstring for pillar.get
 2015-01-05 13:24:43 -07:00
Thomas S Hatch
e4b95b6031 Merge pull request #19330 from cro/sixfix 
Use salt.ext.six instead of "import six"
 2015-01-05 13:23:07 -07:00
Thomas S Hatch
8bfa8f8259 Merge pull request #19328 from jmdcal/load_checking 
load checking
 2015-01-05 13:22:41 -07:00
Thomas S Hatch
3a1cffde9e Merge pull request #19322 from garethgreenaway/19132_simple_state_notification 
Adding a simple notification function to the test module.
 2015-01-05 13:17:24 -07:00
Thomas S Hatch
dd4fd3ace5 Merge pull request #19307 from blueicefield/feature_mongodb-roles 
Feature : Adding functions to Mongodb module for the management of user roles
 2015-01-05 13:13:29 -07:00
Justin Findlay
18d52d1ff8 fixup win_firewall {en|dis}able 2015-01-05 12:21:26 -07:00
Justin Findlay
ae83af0b71 adding firewall.delete_rule function 
also correcting the documentation for firewall.add_rule
 2015-01-05 12:13:10 -07:00
David Boucha
d83858bb40 fix pylint whitespace errors 2015-01-05 11:48:01 -07:00
David Boucha
88fbb8bc90 fix pylint error: extra space after def 2015-01-05 11:44:10 -07:00
David Boucha
c26bf546a9 use unix line endings 2015-01-05 11:20:07 -07:00
David Boucha
473c3accdd Don't cache sreq when using threading 
This stops caching sreq when using threading as well as attempts to make
sure threads are tracked and reaped.

Fixes: 18515
Fixes: 19167
 2015-01-05 11:03:50 -07:00
Nicole Thomas
f01ce36e89 Merge pull request #19340 from nmadhok/zpool-unit-test 
Adding unit tests for salt.modules.zpool
 2015-01-05 10:11:46 -07:00
Gareth J. Greenaway
fe39aade2a Allow the version argument for the pkg state to accept the "latest" as a value. If specified then the latest version available will be installed. Per #19291 2015-01-05 09:05:09 -08:00
Christophe Fonteyne
26151774fd Update states/augeas.py. Fix index error. 
When specifying the test parameter, you get the error:

    Function: augeas.change
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib/python2.6/site-packages/salt/state.py", line 1533, in call
                  **cdata['kwargs'])
                File "/usr/lib64/python2.6/contextlib.py", line 34, in __exit__
                  self.gen.throw(type, value, traceback)
                File "/usr/lib/python2.6/site-packages/salt/utils/context.py", line 41, in func_globals_inject
                  yield
                File "/usr/lib/python2.6/site-packages/salt/state.py", line 1533, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.6/site-packages/salt/states/augeas.py", line 170, in change
                  ret['comment'] += ' in file {1}:\n'.format(context)
              IndexError: tuple index out of range


This change fixes the issues and provides better output.
 2015-01-05 18:04:19 +01:00
Mike Place
f44e46d080 Adjust batch test 2015-01-05 10:04:15 -07:00
Mike Place
cfc76d585e Catch all Django errors and some PEP8 cleanup. 
Django can throw a variety of errors, so we need to catch
Django-specific exceptions instead of just an ImportError.
 2015-01-05 09:41:53 -07:00
robert.fach
2b4caaa45f changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-05 16:54:14 +01:00
robert.fach
4cb4c7d6e0 changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-05 16:50:24 +01:00
C. R. Oldham
35b82ab6e8 Use salt.ext.six instead of "import six", import it "as six" 2015-01-05 08:06:56 -07:00
Jayesh
e20076691b adding apache unit test case 2015-01-05 15:06:14 +05:30
Tomas Neme
1f8def056f fix docstring 2015-01-05 15:03:41 +08:00
Nitin Madhok
c21c7c96c5 Changing return to match zpool list instead of zfs list 2015-01-04 23:48:30 -05:00
nmadhok
2c53cbec1d Replacing zfs with zpool 2015-01-05 10:04:38 +05:30
Ryne McCall
a0e2f09ec5 Support messages containing non-ascii characters 
This fixes #19338.
 2015-01-04 21:58:07 -05:00
Pedro Algarvio
0452b43af6 Merge pull request #19335 from rallytime/pylint_develop 
Fix develop pylint
 2015-01-04 11:56:20 +00:00
rallytime
fb9bc7de94 Fix develop pylint 2015-01-03 22:02:41 -07:00
Nicole Thomas
06795221be Merge pull request #19334 from rallytime/pylint 
Fix pylint on 2014.7 branch
 2015-01-03 21:59:12 -07:00
rallytime
57514d824b Fix pylint on 2014.7 branch 2015-01-03 21:44:09 -07:00
Nicole Thomas
621bcee92d Merge pull request #19273 from jayeshka/extfs_unit_tests 
adding extfs unit test
 2015-01-03 20:20:09 -07:00
Hang Xie
6edc596f28 Write to temp file then move to data.p to avoid race condition 2015-01-03 16:41:36 -08:00
James Michael DuPont
5d72c52838 load checking 
want to rebuild
fixes #19264

load checking

want to rebuild
 2015-01-03 16:22:36 -06:00
C. R. Oldham
434376cd69 Use salt.ext.six instead of "import six" 2015-01-03 09:09:38 -07:00
Joseph Hall
05089e188d Merge pull request #19325 from twellspring/patch-2 
Add private subnets
 2015-01-02 20:31:49 -07:00
twellspring
f8883cebdd Add private subnets 
Added how to enable rackspace private subnets on servers instantiated by salt cloud
 2015-01-02 19:28:45 -08:00
Thomas Jackson
e37353e50c Remove sock_dir from crypt.dropfile() 2015-01-02 16:14:19 -08:00
Thomas Jackson
deb60fd198 Make AES key never hit disk on the master 
In the past we've been doing coordination of the aes key using dropfiles etc. Not only is this significantly more costly (at least 1 stat per reqserver request) it also means that the symmetric key we use to pub/req messages has been on disk. This re-works the aes key to be a multiprocessing.Array() (char array) which is shared amongst the processes. Now the dropfile is just a request for the master to rotate the key, and this means that *all* key rotation on the master will generate the appropriate event (instead of just ones who passed in sock_dir to dropfile())
 2015-01-02 16:11:24 -08:00
Gareth J. Greenaway
6a3c15a7c3 Adding a simple notification function to the test module. 2015-01-02 15:24:32 -08:00
Thomas S Hatch
e2dd4b9958 Merge pull request #19320 from clan/opt_profile 
add 'state_output_profile' option for profile output
 2015-01-02 10:39:22 -07:00
Z. Liu
d46b6b6490 sate_output_profile default to True 2015-01-03 01:36:21 +08:00