Commit Graph

62475 Commits

Author SHA1 Message Date
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
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
Mike Place
aee5b62542 Merge pull request #35680 from terminalmage/issue35630
Don't use six.text_type() in salt.utils.gitfs
2016-08-23 16:17:00 +09:00
Erik Johnson
d76659a63a Don't use six.text_type() in salt.utils.gitfs
For Python 2, Pygit2 (as well as others) store unicode strings as bytes
(e.g. ``'\xd0\x94'``), not as unicode strings. This can result in a
``UnicodeDecodeError`` being raised when ``os.path.join()`` is invoked
and Python attempts to decode the bytestring.

This commit fixes the issue by using ``str()`` to force config values to
be strings, rather than ``six.text_type()``.

Resolves #35630.
2016-08-22 20:21:32 -05:00
Nicole Thomas
74678923b8 Fixup doc formatting for the sqs_events engine (#35663)
Fixes #35509
2016-08-22 13:04:33 -06:00
Nicole Thomas
399e9f57cc Update release notes for 2015.8.12 (#35614) 2016-08-19 16:13:08 -06:00
Nicole Thomas
f7f8221169 Everything in the sample master config file should be commented out (#35611) 2016-08-19 16:05:40 -06:00
Thomas S Hatch
c9070c212f Merge pull request #35569 from rallytime/test-for-35384
Write test for multiple unless commands where 1st cmd passes and 2nd fails
2016-08-19 13:28:01 -06:00
Nicole Thomas
0c7aa802f5 Update release notes for 2015.8.12 (#35600) 2016-08-19 10:13:41 -06:00
Nicole Thomas
dd12b48239 Update release notes for 2015.8.12 (#35599) 2016-08-19 09:59:31 -06:00
Erik Johnson
beb6ca8ef9 Update linux_sysctl tests to reflect new context key (#35584)
* Update docstring to reflect optional context argument

It used to not be optional.

* Update linux_sysctl tests to reflect new context key

This key was changed in 5b12f03, this updates the tests to reflect the
change.
2016-08-18 20:56:08 -06:00
Erik Johnson
fd08d33597 Add warning about AWS flagging of nmap usage (#35575)
* Add warning about AWS flagging of nmap usage

Also improve the verification examples overall, and add a note about the
fingerprint display difference beginning in OpenSSH 6.8.

* Remove "as root"

For some reason, when I was running the test in the example, I wasn't
getting the script output for the host key, unless I ran as root. Don't
know why this was the case but I can't reproduce it now. Removing this
as it is not accurate.

Also added a port number to the example as well since it speeds up the
nmap command.
2016-08-18 17:00:02 -06:00
Erik Johnson
26a7f7d9f7 Merge pull request #35577 from terminalmage/unit-file-changes
Unit file changes for 2015.8.12, 2016.3.3
2016-08-18 15:36:25 -05:00
Erik Johnson
6cb0fb47f3 pkg/salt-syndic.service: change Type to notify 2016-08-18 14:45:46 -05:00
Erik Johnson
175ba99e0e pkg/salt-minion.service: remove KillMode, change Type to notify 2016-08-18 14:44:51 -05:00
Erik Johnson
540ec28954 pkg/salt-master.service: remove KillMode 2016-08-18 14:44:19 -05:00
Erik Johnson
69fad464ab pkg/salt-api.service: change Type to notify 2016-08-18 14:43:50 -05:00
rallytime
30f42d5352 Write test for multiple unless commands where 1st cmd passes and 2nd fails
This is a regression integration test for #35384, which was fixed by #35545,
and back-ported to the 2015.8 branch in #35566.
2016-08-18 11:04:08 -06:00
Nicole Thomas
2a5d1a0eee fix-35384, fix the logic caused by wrong indent (#35566) 2016-08-18 11:03:24 -06:00
Erik Johnson
feb852f8c0 Clarify config.get docstring (#35492)
* Clarify config.get docstring

This commit adds clarification that Salt's built-in config options
cannot be overriden by config.get.

* Remind user that pillar_opts must be turned on to traverse master opts

* s/by/be/
2016-08-18 09:33:49 -06:00
Mike Place
205d8e2e7b Merge pull request #35483 from gtmanfred/2015.8
use __utils__ in salt.cloud
2016-08-18 22:32:22 +09:00
Mike Place
70fa2d0901 Merge pull request #35546 from whiteinge/salt-api-eauth-fail-gracefully
Salt api eauth fail gracefully
2016-08-18 16:21:55 +09:00
Seth House
eb3574adae Don't fail hard if the user's permissions cannot be found
Salt enforces authorization not salt-api. Showing the user his/her
permissions is a nicety only. We should make a best effort to retrieve
them but if we cannot we should log the user in instead of blocking.
2016-08-17 18:56:03 -06:00
Seth House
ec597bd54c Change groups check in token to look for truthy values
The 'groups' value in the token payload can be missing, can be False,
can be None, or can be an array.
2016-08-17 18:38:09 -06:00
David Boucha
61fec6caa9 add missing glob import (#35525)
* add missing glob import

* move glob import so pylint doesn't freak out.

* pylint requires 2 spaces before the comment.

* remove trailing whitespace
2016-08-17 16:10:00 -06:00
Nicole Thomas
0e3f2fc6cb Whitespace fix for 2015.8 (#35540) 2016-08-17 15:33:17 -06:00
Thomas S Hatch
fd3274c800 Merge pull request #35510 from terminalmage/issue33516
Better systemd integration
2016-08-17 12:54:11 -06:00
Erik Johnson
5b5f19d269 Update zypper unit test to reflect call to config.get 2016-08-17 11:43:22 -05:00
Erik Johnson
2730edb516 Add note about systemd-run usage in package states 2016-08-17 11:43:22 -05:00
Erik Johnson
e2d9e87e10 salt/modules/systemd.py: Use systemd-run --scope where needed 2016-08-17 11:43:22 -05:00
Erik Johnson
22919a25bc Notify systemd on salt-api start 2016-08-17 11:43:22 -05:00
Erik Johnson
a40b3f8a08 Notify systemd on syndic start 2016-08-17 11:43:22 -05:00
Erik Johnson
e847d3af30 Notify systemd on minion start 2016-08-17 11:43:22 -05:00