valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,385 Commits 24 Branches 182 Tags 341 MiB
39b49621ad
Commit Graph

64385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
Mike Place
4c7f082816 Merge pull request #30307 from MadsRC/develop 
Added event_return() support to postgres_local_cache
 2016-01-14 11:08:10 -07:00
Mike Place
b2e88f4b05 Merge pull request #30222 from neonobjclash/netmod 
Add option to only get public or private addresses in module.network.ip_addrs()
 2016-01-14 11:05:47 -07:00
Mike Place
f4118be6e4 Merge pull request #30267 from isbm/isbm-zypper-isotimefix 
Fix RPM issues with the date/time and add package attributes filtering
 2016-01-14 11:00:01 -07:00
Mads R. Christensen
d59c2569ec Readded postgres returner and fixed some lint issues 2016-01-14 18:35:02 +01:00
Mike Place
b61cb7a238 Merge pull request #30360 from jfindlay/remove_doc 
file.remove, file.absent: mention recursive dir removal
 2016-01-14 10:30:25 -07:00
Justin Findlay
a21ccd2700 file.remove, file.absent: mention recursive dir removal 
Fixes #30330.
 2016-01-14 10:20:02 -07:00
Mike Place
ba8d128025 Merge pull request #30221 from mbarrien/postgres-9.5 
No rolcatupdate for user_exist in Postgres>=9.5 #26845
 2016-01-14 09:52:49 -07:00
Mike Place
496be3b2cf Merge pull request #30344 from twangboy/salt-osx-update 
Additional Mac Update Functionality
 2016-01-14 09:40:37 -07:00
Mike Place
4787c2c9ad Merge pull request #30358 from terminalmage/libgit2-version 
Add libgit2 version to versions-report
 2016-01-14 09:37:28 -07:00
Mike Place
af2ddfd31c Merge pull request #30346 from pass-by-value/aws_vols_attach 
Prevent orphaned volumes
 2016-01-14 09:37:08 -07:00
Mike Place
62539ad716 Merge pull request #30351 from MIBc/virt_ret 
Summary: correct a small defect in openstack_config.set function.
 2016-01-14 09:32:28 -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
fbf5ca99dc Merge pull request #30357 from nmadhok/patch-2 
Adding code author
 2016-01-14 09:23:22 -07:00
Mike Place
4bdade6010 Merge pull request #30356 from nmadhok/patch-1 
Adding code author
 2016-01-14 09:23:08 -07:00
Erik Johnson
89fe571791 Add libgit2 version to versions-report 2016-01-14 09:59:45 -06:00
Nitin Madhok
2138c1448b Adding code author 
Adding code author since majority of the code was taken from salt/cloud/clouds/vmware.py
 2016-01-14 10:05:57 -05: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
Lvjiawei
0c6e86dbae Summary: correct a small defect in openstack_config.set function. 
Desrciption:
When execte command "salt '*' openstack.set file section key true".
The function will raise TypeError, because the "_quote" function need a
string as input parameter. However, salt bash resolve "true" to Ture a
bool variable which is passed into "_quote". Therefore, if user wants to
set a string "true" in openstack config file, he must use a command like
salt '*' openstack_config.set file section key "'true'". Similar issue
also occurs when input a number parameter in salt bash.
 2016-01-14 10:12:22 +08: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
C. R. Oldham
03262c432c Merge pull request #30347 from rallytime/merge-30231 
Merge #30231 with updates to dependency documentation
 2016-01-13 16:36:35 -07:00
twangboy
7de214453f Added 'version added' to new functions 2016-01-13 15:53:33 -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
Nicole Thomas
8f0a51f987 Merge pull request #30338 from blbradley/salt-cloud-ec2-map-size-dead 
salt-cloud: remove dead MAP_SIZE from cloud/ec2.py
 2016-01-13 15:39:59 -07:00
Mike Place
3bbed62d07 Merge pull request #30339 from jfindlay/bp-26511 
Backport #26511
 2016-01-13 15:35:17 -07:00
twangboy
9dd4e5e9e0 renamed softwareupdate module to mac_softwareupdate 2016-01-13 15:32:06 -07:00
Aditya Kulkarni
19fce03ee2 Prevent orphaned volumes 2016-01-13 17:02:50 -05:00
twangboy
349e6aad7c removed python_shell=False 2016-01-13 14:59:44 -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
twangboy
0e1c4b0cb1 Removed mac_update module 2016-01-13 14:54:23 -07:00
twangboy
d5eb0f39b0 Updated docs, fixed problem witn None 2016-01-13 14:45:28 -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
Joseph Hall
4466cb30ad Merge pull request #30337 from blbradley/salt-cloud-add-ec2-nano-instance 
salt-cloud: add t2.nano instance to Amazon EC2
 2016-01-13 14:35:17 -07:00
Mike Place
c5d1365a36 Merge pull request #30331 from alprs/feature-patch_dir 
Make file.patch work with directories
 2016-01-13 14:34:58 -07: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
Brandon Bradley
533bd12fd7 salt-cloud: remove dead MAP_SIZE from clouds/ec2.py 2016-01-13 15:25:00 -06:00
twangboy
5d3ccc871a Additional functions, fixed blank dictionaries 2016-01-13 14:14:31 -07: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
rallytime
2beb75e49f Merge #30231 with updates to dependency documentation 2016-01-13 14:10:00 -07:00
Brandon Bradley
30cca19c6a salt-cloud: add t2.nano instance to Amazon EC2 2016-01-13 15:07:42 -06:00
twangboy
97b5462d77 Found an existing module 2016-01-13 13:49:18 -07:00
twangboy
2ce7ee1af8 Bug fixes and refactoring 2016-01-13 13:39:14 -07:00
Mike Place
09b144aa98 Merge pull request #30327 from kraney/boto_cloudtrail 
Support for AWS CloudTrail
 2016-01-13 13:18:06 -07:00