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,634 Commits 24 Branches 182 Tags 341 MiB
91b14dca40
Commit Graph

60634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
d86e014a39 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    README.rst
    salt/modules/yumpkg.py
 2016-02-09 11:11:36 -07:00
Mike Place
0dcdd0a2a7 Merge pull request #30998 from dmacvicar/dmacvicar-2015.8-27796 
add_key/reject_key: do not crash w/Permission denied: '/var/cache/salt/master/.dfn' (#27796)
 2016-02-09 10:57:36 -07:00
Mike Place
e773fc822a Merge pull request #31049 from twangboy/win_svc_docs 
Fix versionadded in win_service.config
 2016-02-09 10:55:07 -07:00
twangboy
98005255d1 Fix versionadded in win_service.config 2016-02-09 10:52:15 -07:00
Mike Place
c3f115724a Merge pull request #30987 from youngnick/add-back-localhost-peer-handling 
Changed glusterfs.peer() module so state can handle localhost peering attempts.
 2016-02-09 10:51:58 -07:00
Mike Place
8518655bfb Merge pull request #31042 from moltob/fix-archive-winpath 
Allow using Windows path in archive.extracted name attribute
 2016-02-09 10:47:20 -07:00
Mike Place
1950359580 Merge pull request #31012 from terminalmage/fix-gitfs-provider-lc 
Fix gitfs/git_pillar/winrepo provider to allow lowercase values
 2016-02-09 10:24:25 -07:00
Mike Place
3d8681b63e Merge pull request #31024 from jfindlay/dist_upgrade 
modules.aptpkg.upgrade: clarify dist-upgrade usage
 2016-02-09 10:20:57 -07:00
Mike Place
a0454ffb00 Merge pull request #31028 from twangboy/fix_installer 
Fix config overwrite by windows installer
 2016-02-09 10:20:24 -07:00
Mike Place
071b9d4904 Merge pull request #31031 from terminalmage/issue31014 
More complete fix for #31014
 2016-02-09 10:04:41 -07:00
Mike Pagel
9dcc617a53 Allow using Windows path in archive.extracted name attribute, including drive letter colon and backslashes. 2016-02-09 15:28:33 +01:00
Denys Havrysh
afdaefbf3d Add systemctl examples for RHEL 7 to the installation guide 2016-02-09 14:48:26 +02:00
Denys Havrysh
069a661eb1 Correct ZeroMQ4 repo install guide for RHEL 2016-02-09 14:33:18 +02:00
Denys Havrysh
d2a9d67b5b Update installation instruction for community repos on RHEL 2016-02-09 13:57:58 +02:00
Denys Havrysh
bbdf2523c8 Add workaround for RHEL 7 systems mentioned in the issue #29094 2016-02-09 12:32:57 +02:00
Erik Johnson
6d15a17d6b Fix yumpkg _get_branch_option() 
Needs to be returning a list
 2016-02-09 01:15:14 -06:00
Erik Johnson
4b855a85ee Don't handle epoch specially for dnf 
Epoch handling is done in salt.utils.pkg.rpm.parse_pkginfo() now, so
remove special handling for dnf and make both yum and dnf work the same.
 2016-02-08 21:09:43 -06:00
Erik Johnson
5244de2fae More efficient way to add the epoch before version number 2016-02-08 21:08:51 -06:00
twangboy
baffbbdb74 Comment multiprocessing line in minion config 2016-02-08 18:14:17 -07:00
twangboy
933544b8c8 Set multiprocessing to true in config.py 2016-02-08 18:13:07 -07:00
twangboy
8876893b5c Fix remove placeholder files 2016-02-08 17:51:36 -07:00
twangboy
788855cc94 Remove placeholder files 2016-02-08 17:42:07 -07:00
twangboy
c834a9d5e5 Set overwrite to off 
Remove place holder files (empty)
 2016-02-08 17:29:39 -07:00
Colton Myers
2b8f7a12e7 Merge pull request #31026 from terminalmage/issue30934 
Fix regression when contents_pillar/contents_grains is a list.
 2016-02-08 17:03:15 -07:00
Nick Young
730b5ef3e2 Update tests to cover new peering return val. 2016-02-09 10:58:44 +11:00
Erik Johnson
f43aaf4dff Fix regression when contents_pillar/contents_grains is a list. 
Resolves #30934.
 2016-02-08 16:47:02 -06:00
Justin Findlay
3d1be080ad modules.aptpkg.upgrade: clarify dist-upgrade usage 
Fixes #30983.
 2016-02-08 15:18:32 -07:00
Erik Johnson
763581798b Add unit tests to ensure a valid provider 2016-02-08 15:18:11 -06:00
Daniel Wallace
e1211ed89f include possible epoch in version for rpm 
Fixes #31014
 2016-02-08 14:05:39 -06:00
Erik Johnson
49ec61d58b Fix gitfs/git_pillar/winrepo provider to allow lowercase values 
This was an unintended side effect of the rewrite. This fix will restore
the previous (and intended) behavior.
 2016-02-08 13:55:07 -06:00
Mike Place
de215bd0cd Merge pull request #30978 from garethgreenaway/30472_state_functions_no_default_retcode 
fixes to state.py in 2015.8
 2016-02-08 11:49:05 -07:00
Mike Place
65fbf980cf Merge pull request #30893 from bdrung/reproducible 
Make build reproducible
 2016-02-08 11:44:35 -07:00
Mike Place
5b0c7649c7 Merge pull request #30945 from cachedout/note_pillar_cli 
Note that pillar cli args are sent via pub
 2016-02-08 11:43:59 -07:00
Mike Place
3b7b6f2398 Merge pull request #31002 from rmtmckenzie/cloud-lxc-provide-fix 
Fix lxc cloud provided minion reporting present
 2016-02-08 11:14:50 -07:00
Mike Place
c48122ae9a Merge pull request #31007 from jtand/rabbitmq_vhost_test_fix 
Fixed rabbitmq_vhost test failure.
 2016-02-08 10:48:00 -07:00
Mike Place
811461e4b4 Merge pull request #31004 from rallytime/fix-30993 
Remove overstate docs and a few references.
 2016-02-08 10:08:24 -07:00
justinta89
962e0deda5 Fixed rabbitmq_vhost test failure. 2016-02-08 10:02:43 -07:00
Mike Place
1c699a1664 Merge pull request #30974 from rallytime/bp-30949 
Back-port #30949 to 2015.5
 2016-02-08 09:38:46 -07:00
rallytime
33eb6ba125 Remove overstate docs and a few references. 
The overstate system was deprecated and removed in Beryllium, in
favor of orchestrate.
 2016-02-08 09:28:32 -07:00
Morgan McKenzie
9b17fdce5e Fix lxc cloud provided minion reporting present 
LXC minion is reporting as present when configured
with cloud state, even though it is not.

Fixes issue #31000
 2016-02-08 15:06:56 +00:00
Duncan Mac-Vicar P
9602fe2aeb Do not crash on add_key/reject_key if the previous one set the drop file. (#27796) 
The umask set does not allow salt-key to overwrite the .dfn file. However, if the
master has not yet rotated the key but the rotation was requested, there should be no
reason to request a second time.
 2016-02-08 15:00:26 +01:00
Nicole Thomas
64125de6c7 Merge pull request #30965 from alprs/fix-rabbitmq_vhost_present_test 
Fix rabbitmq_vhost.present result when test=True
 2016-02-07 21:34:45 -07:00
Nick Young
b2407305e8 Changed glusterfs.peer() module call return val so state can handle localhost peering attempts. 
When the _gluster_xml command-calling method was introduced, glusterfs.peer() lost the ability to pass the output string back to the calling function. This meant that, in the case that you were attempting to peer probe localhost, glusterfs.peer would return successfully, the state would populate its .comment return value with a boolean value, and the output formatters would not be able to cast bool correctly, making the output look different. Not a functional regression, just a display one.

This just changes glusterfs.peer() to return a dict with the return code and output - possibly overkill since it's not used anywhere, but it's a little nicer for command-line execution now as well. I couldn't find any other references to return codes anywhere else, but if people were relying on the return val of the module being boolean, this would break that.

I think having the command exitval is more useful.
 2016-02-08 11:37:58 +11:00
Andreas Lutro
2313747958 return changes when test=True 2016-02-07 08:19:48 +01:00
Gareth J. Greenaway
e33b5140f6 removing extra spaces. 2016-02-06 20:05:34 -08:00
Gareth J. Greenaway
f668ccf1f7 removing duplicate code, just set the default in the _set_retcode function 2016-02-06 20:02:54 -08:00
Gareth J. Greenaway
5f2f0f60c0 The functions in the state module that return a retcode when something goes wrong, eg. a 1 or a 2, do not return a 0 when things go the way they're supposed to go. With the recent changes to the scheduler to ensure that the retcode is returned this is problematic and results in exceptions when a state function is run from the schedule. This simple fix ensures a default retcode of 0 exists, it is then override in the _set_retcode function if there is an issue with the run 2016-02-06 15:52:17 -08:00
Tim Harper
b4fe9aaa11 fixes issue in which s3.role_arn was defaulting to '' 
fixes #30899
 2016-02-06 14:10:20 -07:00
Andreas Lutro
95c8e74b72 make the code a bit simpler 2016-02-06 19:36:51 +01:00
Joseph Hall
ff6542f593 Replace cfdisk with sfdisk 2016-02-06 11:31:41 -07:00