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
62,506 Commits 24 Branches 182 Tags 341 MiB
d1b9a4061e
Commit Graph

62506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pablo Suárez Hernández
d1b9a4061e Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-08 11:36:17 +01:00
Mike Place
c4ddfe3887 Merge pull request #35954 from morganwillcock/upgrade-on-batteries 
win_pkg: Allow minion upgrade on batteries and report launch failure
 2016-09-08 10:25:37 +09:00
Mike Place
94b7659304 Merge pull request #36129 from terminalmage/pygit2-ssl_verify 
pygit2: Prevent traceback on initial gitfs setup
 2016-09-08 10:03:25 +09:00
Erik Johnson
640f0c17c6 pygit2: Prevent traceback on initial gitfs setup 
Newer pygit2 releases require that this value be a string, they will not
accept a bool here.
 2016-09-07 17:12:05 -05:00
Nicole Thomas
7cdbc546f1 Back-port #36062 to 2015.8 (#36118) 
* Comment all lines in the minion config file

* Add unit tests to check for all files in conf/ to be commented out

* Make sure cont/cloud.profiles file is commented out

Matches the cloud.providers file format and other sample config files.

* Add unit tests for sample files in cloud.profiles.d, cloud.providers.d,
and cloud.maps.d

* Make sure all sample config files in cloud.maps.d are commented out

* Make sure all sample config files in cloud.profiles.d are commented out
 2016-09-07 16:01:34 -06:00
Jonathan Ballet
fa09050150 consul: fix formatting of consul.agent_join (#36061) 2016-09-06 10:43:04 -06:00
Thomas S Hatch
1b39c7ed48 Merge pull request #35978 from DSRCorporation/bugs/28462_update_auth_data_on_reauth 
Update auth data on reauth.
 2016-09-02 14:46:55 -06:00
Nicole Thomas
b652271ddc Fix type error in networkfbsd osmajorrelease compare (#36016) 2016-09-02 14:36:41 -06:00
Nicole Thomas
bc81818075 Merge pull request #36018 from meaksh/bp-36000-to-2015.8 
Back-port #36000 to 2015.8
 2016-09-02 14:34:55 -06:00
Mike Place
e6b93c2380 Merge pull request #36022 from saltstack/revert-33770-service_tests 
Revert "service state integration tests"
 2016-09-02 21:38:36 +09:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09:00
rallytime
8c05d2aac5 Lint for #35916 
Merges #35916
 2016-09-02 11:23:06 +01:00
Eric Jackson
b5fe6100ee Check for single quote before splitting on single quote 
Signed-off-by: Eric Jackson <ejackson@suse.com>
 2016-09-02 11:23:03 +01:00
Erik Johnson
678f10cf8b Avoid traceback in mac_user.py when user.chhome is invoked from a user state (#35901) 
* mac_user.py: Avoid traceback in chhome func

* Add warning about lack of Windows/Mac support for createhome
 2016-09-01 11:44:47 -06:00
Mike Place
2da501071e Merge pull request #35967 from twangboy/improve_show_sls_2015.8 
Allow full path to be passed to show_sls (2015.8)
 2016-09-01 23:54:55 +09:00
Mike Place
d86fba15b3 Merge pull request #35981 from cachedout/cptestcase_license 
Update Salt's licensing information to include cptestcase
 2016-09-01 23:48:45 +09:00
Mike Place
dd562dd200 Update Salt's licensing information to include cptestcase 
From https://github.com/adamhajari/spyre/blob/master/LICENSE.txt
 2016-09-01 18:46:13 +09:00
Dmitry Kuzmenko
778ae9a9ff Update auth data on reauth. 
If minion reauth in a subprocess, like scheduler jobs, update the auth
data in the main process by sending and handling a local event.
 2016-09-01 11:59:45 +03:00
twangboy
2ed9a82ef8 Allow full path to be passed to show_sls 2016-08-31 15:31:39 -06:00
Jacob Hammons
0f0f15d048 Merge pull request #35956 from jacobhammons/dot12 
Version docs to 2015.8.12
 2016-08-31 14:39:35 -06:00
Jacob Hammons
3e21e35933 Version docs to 2015.8.12 2016-08-31 14:38:16 -06:00
Morgan Willcock
108f9470f2 win_pkg: report failure for failed launch of Scheduled Task 
If the Scheduled Task fails to launch, log this and report the failed status. Don't check for success as the Task Scheduler doesn't give return codes for actions it ran, and only the minion upgrade should be using this (so successful installation or removal would never be reported anyway).
 2016-08-31 21:02:02 +01:00
Morgan Willcock
e0978220f7 win_pkg: allow minion upgrade when using batteries 
Don't prevent the Scheduled Task option from doing package operations, when the system is running on batteries
 2016-08-31 20:34:49 +01:00
Daniel Wallace
d2db4ea7a2 cachedir should be /cloud not /master (#35897) 
Fixes #35893
 2016-08-31 10:38:43 -06:00
Erik Johnson
f4cdcc0d66 Better logging when file_recv_max_size is exceeded (#35914) 
This gives more information on what to do when this limit is exceeded.
 2016-08-30 14:03:02 -06:00
Loren Gordon
08e10f69eb Clarifies how to create aliased functions (#35891) 2016-08-30 10:04:58 -06:00
Mike Place
6dd5f68a08 Merge pull request #35856 from vutny/2015.8 
[BACKPORT 2015.8] salt-cloud: fix path to Salt Master socket dir
 2016-08-30 16:10:02 +09:00
Mike Place
336d1a700d Merge pull request #35880 from terminalmage/issue35747 
pacman.py: Fix incorrect return in pkg.latest_version
 2016-08-30 15:43:39 +09:00
Mike Place
6383451c99 Merge pull request #35884 from terminalmage/clarify-pkg-latest-logic 
Add clarifying comments to the pkg.latest state, fix USE flag condition
 2016-08-30 15:42:35 +09:00
Erik Johnson
b0b419d1d8 Fix condition for Gentoo USE flag update 
In this scenario, ``avail[pkg]`` contains an empty string, we want to
reinstall the current version with new USE flags so the
currently-installed version is what we need to add to the targets.
 2016-08-29 19:18:50 -05:00
Erik Johnson
1542fd4716 Add clarifying comments to the pkg.latest state 
These comments explain what is being done as we evaluate which packages
need to be added to the install targets and which do not.
 2016-08-29 19:14:06 -05:00
Erik Johnson
123a611066 pacman.py: Fix incorrect return in pkg.latest_version 
This was initially broken in 75fd92f. The documented behavior of this
function is to return an empty string for the package when the package
is up-to-date. Changing that behavior negatively affects the pkg.latest
state, which relies on the documented behavior.
 2016-08-29 18:59:12 -05:00
Denys Havrysh
eceedadfa5 salt-cloud: fix path to Salt Master socket dir 2016-08-29 18:10:30 +03:00
Mike Place
eda2ae0add Merge pull request #35781 from thatch45/ssh_deploy_more 
follow up on the re-deploy if there is a checksum missmatch
 2016-08-29 11:15:25 +09:00
Mike Place
165237412c Merge pull request #35815 from gtmanfred/2015.8 
list_nodes_min should return a minimum dictionary
 2016-08-29 11:03:27 +09:00
Mike Place
b12c6577d2 Merge pull request #35833 from terminalmage/2015.8-top-file-merging-docs 
One more tweak to top file merging docs
 2016-08-29 10:21:16 +09:00
Erik Johnson
c534d88280 More clarification/correction in minion docs 2016-08-27 15:18:06 -05:00
Erik Johnson
e9e6ea8485 One more tweak to top file merging docs 
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
 2016-08-27 14:30:14 -05:00
Daniel Wallace
805d43598e list_nodes_min should return a minimum dictionary 
Not true or False
 2016-08-26 14:39:41 -05:00
Nicole Thomas
d285fe64b7 Merge pull request #35811 from rallytime/bp-35576 
Back-port #35576 to 2015.8
 2016-08-26 12:54:08 -06:00
Art Schneider
04c063b315 Updated user.py to redact password when test=true 2016-08-26 11:07:20 -06:00
Todd Wells
e212c55b7a Schedule documentation update (#35745) 
* Scheduling jobs add state and module options

* Scheduling jobs doc formatting
 2016-08-26 10:47:04 -06:00
Erik Johnson
eb4d2f299b Better unicode handling in gitfs (#35802) 
* Revert "Don't use six.text_type() in salt.utils.gitfs"

This reverts commit d76659a63a.

* salt.utils.path_join: handle mixed unicode/binary-unicode paths

* Add test for mixed unicode and binary-unicode paths

* salt.utils.gitfs: replace os.path.join with salt.utils.path_join
 2016-08-26 10:44:22 -06:00
Nicole Thomas
0ee237a9cb Remove extra "to" in top.rst docs (#35808) 
Refs #35774
 2016-08-26 10:38:57 -06:00
Erik Johnson
2fc61763d8 Correct the top_file_merging_strategy documentation (#35774) 
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.

These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
 2016-08-26 10:25:56 -06:00
Thomas S Hatch
2558dcc100 follow up on the re-deploy if there is a checksum missmatch 2016-08-25 14:17:39 -06:00
Jacob Hammons
2a12795bac Fixes Windows download paths (#35742) 2016-08-24 13:38:17 -06:00
Mike Place
06a75be8bd Merge pull request #35701 from gtmanfred/2015.8 
use aws.get_location in s3 modules
 2016-08-24 16:46:30 +09:00
C. R. Oldham
79bc01b88c Make test runs behave better (#35708) 2016-08-23 14:15:48 -06:00
Daniel Wallace
2d2bc1ffea use aws.get_location in s3 modules 
Also load the __utils__ into pillar and fileserver and fileclient so
that this function can be used there with __opts__.

Also sets the default for s3 to 'us-east-1' like it is documented.

Closes #30976
Closes #28913
 2016-08-23 12:12:15 -05:00