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
60,028 Commits 24 Branches 182 Tags 341 MiB
048b13cf73
Commit Graph

60028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Valaitis
048b13cf73 Pass RBENV_VERSION in env dict, and protect shlex.split 2016-01-14 11:58:29 -07:00
Mike Place
bccb8f3b5b Merge pull request #30349 from rallytime/bp-30347 
Back-port #30347 to 2015.8
 2016-01-14 09:26:37 -07:00
Mike Place
7ee61f0d62 Merge pull request #30354 from alprs/fix-pillar_ignore_missing 
Make sure all ignore_missing SLSes are catched
 2016-01-14 09:24:19 -07:00
Mike Place
4bdade6010 Merge pull request #30356 from nmadhok/patch-1 
Adding code author
 2016-01-14 09:23:08 -07:00
Nitin Madhok
581e4f5dc7 Adding code author 
Adding code author since majority of the code was taken from salt/cloud/clouds/vmware.py
 2016-01-14 10:04:47 -05:00
Andreas Lutro
2f662bbc8d make sure *all* ignore_missing slses are catched 
previously, only the last statement in top.sls with `ignore_missing:
true` would actually be effective.
 2016-01-14 14:18:11 +01:00
rallytime
df70afdaa3 Merge #30231 with updates to dependency documentation 2016-01-13 16:41:29 -07:00
Nitin Madhok
a7c2ad5505 Fix issue where pyVmomi 6.0.0 raises SSL Error for systems using Python2.7+ 2016-01-13 16:40:12 -07:00
Mike Place
d5b8776355 Merge pull request #30340 from jtand/seed_test_fix 
Updated seed_test.py for changes made to seed module
 2016-01-13 15:50:34 -07:00
Mike Place
3bbed62d07 Merge pull request #30339 from jfindlay/bp-26511 
Backport #26511
 2016-01-13 15:35:17 -07:00
Nicole Thomas
6079a96e6e Merge pull request #30343 from rallytime/fix-2015.8 
Fix 2015.8 from incomplete back-port
 2016-01-13 14:56:26 -07:00
Thayne Harbaugh
5eef9d5067 Use a broader test for unset "id" 
The "id" option is of type string - testing that an uninitialized "id" is
specifically None is too narrow.

Fixes #28339
References #28189
 2016-01-13 21:44:31 +00:00
Thayne Harbaugh
460a3c98cc Additional corrections to use option defaults directly from salt.config 
* correct 'id' entry in salt.config
  * add 'event_match_type' in salt.config
  * ensure that hash is only calculated in minion since it isn't needed by the master

Conflicts:
	salt/config.py
 2016-01-13 21:44:06 +00:00
Thayne Harbaugh
4e53ef0bf6 Always get default option settings from salt.config 
It is a poor practice to duplicate settings and scatter them through multiple
files.  Configuration options have been centralize in salt.config, yet
salt.utils.event repeats many of those settings for the benefit of unit tests
that pass only partial "opts" parameters.  Rather than change all of the unit
tests (and other callers) to provide sufficient settings in the "opts"
parameters, the various classes that need opts should start with the default
options provided by salt.config as a base and then the passed-in "opts"
parameter to __init__() functions should override the base options.

  * Use the appropriate salt.config.DEFAULT_MASTER_OPTS or
    salt.config.DEFAULT_MINION_OPTS.

  * Remove all of the spurrious, redundant default settings from
    salt.utils.event.

  * Drop use of "opts.get(KEY)" in favor of "opts[KEY]" - KeyError exceptions
    are a good thing because they indicate that an appropriate default is not
    in salt.config.

TODO: Perform similar clean-ups through other files in the code base.

Conflicts:
	salt/utils/event.py
 2016-01-13 21:42:22 +00:00
Mike Place
7276d808ff Merge pull request #30342 from eliasp/2015.8-log-message-format 
Correct whitespace placement in error message
 2016-01-13 14:32:26 -07:00
Mike Place
94ee6f88af Set a fallback HWM 
This mostly happens in the test suite when opts are setup by hand, but a safe default is a good idea regardless.
 2016-01-13 21:30:56 +00:00
Elias Probst
8e37e36ac7 Correct whitespace placement in error message 2016-01-13 22:29:59 +01:00
Chris Fane
89d9cd5e38 Adds support for nested upstart scripts in the form of subfolder/service. This is implemented via an os.walk through the /etc/init folder, rather than the previous glob for *.conf method. 
Fixes #26478 - nested upstart services are not supported
 2016-01-13 14:13:32 -07:00
Mike Place
10b5728f84 Merge pull request #30308 from rallytime/bp-30257 
Back-port #30257 to 2015.8
 2016-01-13 12:20:13 -07:00
Mike Place
afa61c03db Merge pull request #30187 from rallytime/bp-27606 
Back-port #27606 to 2015.8
 2016-01-13 12:03:11 -07:00
justinta89
ee764ee952 Updated seed_test.py for changes made to seed module 2016-01-13 11:58:05 -07:00
Mike Place
7e89a460e4 Merge pull request #30223 from serge-p/patch-11 
adding support for DragonFly BSD
 2016-01-13 11:24:29 -07:00
Mike Place
5a8da62008 Merge pull request #30238 from rallytime/fix-28396 
Reinit crypto before calling RSA.generate when generating keys.
 2016-01-13 11:22:11 -07:00
Mike Place
15707e0ac8 Merge pull request #30246 from dmacvicar/dmacvicar-2015.8-24237 
Add missing return data to scheduled jobs (#24237)
 2016-01-13 10:51:49 -07:00
Mike Place
8706720148 Merge pull request #30292 from thegoodduke/fix_ipset 
ipset: fix test=true & add comment for every entry
 2016-01-13 10:49:16 -07:00
Mike Place
ea607675f5 Merge pull request #30275 from abednarik/fix_firewalld_ports_permanent 
Add permanent argument in firewalld.
 2016-01-13 10:44:43 -07:00
Mike Place
f02db44757 Merge pull request #30328 from cachedout/fix_file_test 
Fix file test
 2016-01-13 10:42:22 -07:00
Mike Place
dcfba51556 Lint 2016-01-13 10:42:03 -07:00
Mike Place
edd94aea2c Merge pull request #30310 from pass-by-value/empty_bucket_fix 
Empty bucket fix
 2016-01-13 10:30:45 -07:00
Mike Place
b9921128af Kill pointless tests 2016-01-13 10:15:26 -07:00
Mike Place
63c157d0a3 Fix test_managed 2016-01-13 09:54:33 -07:00
Thomas S Hatch
f23f0f30d4 Merge pull request #30211 from techhat/tmppath 
Execute choot on the correct path
 2016-01-13 09:53:40 -07:00
Nicole Thomas
5154c71127 Merge pull request #30309 from rallytime/bp-30304 
Back-port #30304 to 2015.8
 2016-01-13 09:41:53 -07:00
abednarik
0b0d73756e Fix typos in nmp module. 2016-01-13 09:38:01 -07:00
Thayne Harbaugh
8ef6d6c6fd Add additional ZMQ tuning parameters necessary for 1,000+ minions per server. 
Start collecting tuning parameters together in the master config file.
 2016-01-13 09:34:29 -07:00
Nicole Thomas
1624d6cebd Merge pull request #30278 from nmadhok/2015.8-samename-objects-fix 
If datacenter is specified in the config, then look for managed objects under it
 2016-01-13 08:29:36 -07:00
C. Gao
49d70bff16 ipset: fix test=true & add comment for every entry 2016-01-13 10:01:59 +08:00
Aditya Kulkarni
aef5a8898c Add fix for else code path 2016-01-12 16:43:43 -05:00
Aditya Kulkarni
9398c44945 Check and report empty S3 bucket 2016-01-12 16:40:44 -05:00
Tom Kunicki
4a8cc87b47 add spot_prefix to UserData param 
fix #30286
 2016-01-12 14:32:18 -07:00
abednarik
deeeb71dda Add test in npm state. 
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
 2016-01-12 14:30:32 -07:00
rallytime
41d9df45bb Reinit crypto before calling RSA.generate when generating keys. 
Fixes #28396

In order for the `-P` argument to work with salt-cloud, we need to
make sure we're re-initing crypto before calling RSA.generate. This
is similar to the fixes in #23825.
 2016-01-12 14:20:48 -07:00
Mike Place
fc9304f7f8 Merge pull request #30305 from jacobhammons/example-domain 
Changed examples to use the "example.com" domain instead of "mycompan…
 2016-01-12 13:42:10 -07:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Sergey Paramonov
ec798acbcd Update pkgng.py 2016-01-12 15:27:52 -05:00
Mike Place
3bd02a898f Merge pull request #30249 from mpreziuso/patch-2 
Fixes performance and timeout issues on win_pkg.install
 2016-01-12 13:14:54 -07:00
Mike Place
461a741e14 Merge pull request #30217 from pass-by-value/cloud_actions_dispatch 
Make sure cloud actions can be called via salt run
 2016-01-12 13:11:13 -07:00
Mike Place
4a6b53f329 Merge pull request #30268 from terminalmage/issue9569 
Optimize file_tree ext_pillar and update file.managed to allow for binary contents
 2016-01-12 13:09:19 -07:00
Mike Place
dbe7bcdc9a Merge pull request #30245 from rallytime/botosecgroup-docs 
Boto secgroup/iam_role: Add note stating us-east-1 is default region
 2016-01-12 13:04:31 -07:00
Mike Place
6b183778f1 Merge pull request #30299 from rallytime/esxi-proxy-doc-fix 
ESXi Proxy minions states are located at salt.states.esxi, not vsphere.
 2016-01-12 13:03:31 -07:00