Commit Graph

70666 Commits

Author SHA1 Message Date
Mike Place
3fb928b63a Merge pull request #39569 from s0undt3ch/2016.3
Don't use our own six dictionary fixes in this branch
2017-02-22 11:59:48 -07:00
Mike Place
91e3319df8 Merge pull request #39508 from dincamihai/openscap
Openscap
2017-02-22 11:36:35 -07:00
Pedro Algarvio
49da135abd
Don't use our own six dictionary fixes in this branch 2017-02-22 17:18:55 +00:00
Mike Place
fbe2194a93 Merge pull request #39562 from terminalmage/issue30802
Add ulimits to dockerng state/exec module
2017-02-22 09:31:48 -07:00
Erik Johnson
01d4a84a2f dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py (#39544) 2017-02-22 08:51:22 -07:00
Erik Johnson
c50374041d Add ulimits to dockerng state/exec module 2017-02-22 09:20:49 -06:00
twangboy
6d645cae0e Add __virtual__ function 2017-02-21 14:54:21 -07:00
Erik Johnson
da42040c1a Try the docker-py 2.0 client name first
This should give us a modest perfomance improvement as more people begin
to use docker-py>=2.0.
2017-02-21 12:47:14 -06:00
Erik Johnson
dff35b58f8 Merge pull request #39498 from terminalmage/pr-39483
Resubmit PR #39483 against 2016.3 branch
2017-02-20 13:35:32 -06:00
Mihai Dinca
9fedb84607 Always return oscap's stderr 2017-02-20 10:36:01 +01:00
Mihai Dinca
0ecde2cd02 Include oscap returncode in response 2017-02-20 10:36:01 +01:00
Mike Place
6418e725ed Merge pull request #39497 from terminalmage/docker-compat-fixes
Two dockerng compatibility fixes
2017-02-19 10:43:36 -07:00
Erik Johnson
cbd0270bac docker: make docker-exec the default execution driver
Docker 1.13.1 removed the ExecutionDriver from the ``docker info``
return data. This causes all attempts to run commands in containers to
fall back to the old lxc-attach driver, which is incompatible with newer
docker releases.
2017-02-18 22:19:57 -06:00
Erik Johnson
a6a17d58aa Handle docker-py 2.0's new host_config path
docker-py 2.0 made some changes to the location of the function which
creates the host config. This adds a function to get the proper argspec
for host config, networking config, and container config, irrespective
of the installed version of docker-py.
2017-02-18 22:16:03 -06:00
Tomas Zvala
20b097a745 dockerng: compare sets instead of lists of security_opt
Apparently some versions of docker add label=disabled to security_opt
when the container is launched as privileged. This causes Salt to
relaunch the container to remove it on next run.
Container started as privileged and with the security_opt set, causes it
to have the option set twice and makes salt want to remove one instance.
With this fix, dockerng will compare just (non-)existence of the flag.
So containers started with privileged flag and security_opt set to
label=disabled will not get relaunched on every salt run.
Fixes #39447
2017-02-18 21:40:22 -06:00
Mike Place
9c4292fb4e Merge pull request #39423 from dincamihai/openscap
Openscap module
2017-02-17 11:31:04 -07:00
Mihai Dinca
9d13422ac1 OpenSCAP module 2017-02-17 13:50:29 +01:00
Mike Place
7dd2502360 Merge pull request #39464 from gtmanfred/2016.3
skip false values from preferred_ip
2017-02-16 15:48:32 -07:00
Daniel Wallace
f829d6f9fc skip false values from preferred_ip 2017-02-16 15:11:08 -06:00
Mike Place
db359ff2c3 Merge pull request #39460 from cachedout/win_dism_test_fix
Fix mocks in win_disim tests
2017-02-16 12:27:47 -07:00
Mike Place
e652a45592
Fix mocks in win_disim tests 2017-02-16 12:26:49 -07:00
Ivan Babrou
2761a1b244
Move new kwargs to the end of argument list 2017-02-15 22:15:11 -08:00
Mike Place
9dbfba9b57 Merge pull request #39426 from morganwillcock/dism
win_dism: Return failure when package path does not exist
2017-02-15 17:09:22 -07:00
Mike Place
56162706e3 Merge pull request #39431 from UtahDave/fix_grains.setval_performance
Fix grains.setval performance
2017-02-15 16:56:30 -07:00
David Boucha
391bbecd90 add docs 2017-02-15 13:49:24 -07:00
David Boucha
709c197f84 allow sync_grains to be disabled on grains.setval 2017-02-15 13:42:18 -07:00
Ivan Babrou
0df6b922e7
Narrow down connection exception to socket.error 2017-02-15 12:34:04 -08:00
Morgan Willcock
a7d5118262 Return failure when package path does not exist 2017-02-15 17:58:59 +00:00
Mike Place
239e16e612 Merge pull request #39405 from rallytime/fix-39304
Update :depends: docs for boto states and modules
2017-02-15 10:32:07 -07:00
Mike Place
415102f346 Merge pull request #39411 from rallytime/fix-38762
Update external_cache docs with other configuration options
2017-02-15 10:30:39 -07:00
Erik Johnson
7e1803b617 Update docs on upstream EPEL7 pygit2/libgit2 issues (#39421)
pygit2 was rebuilt, but libgit2 still needs a rebuild. I opened an
upstream bug report this morning, this updates the docs to reflect the
current status of this upstream issue.
2017-02-15 10:10:39 -07:00
Erik Johnson
4ff13acf8b salt.fileserver.roots: Fix regression in symlink_list (#39409)
A recent PR of mine removed the logic in symlink_list and fell back to
the cached file list generated in _file_lists(). However, this code
dates back from before the fileserver backends' symlink_list() functions
were modified to return a dict mapping links to their destinations.

This fixes the code in _file_lists() so that it returns the correct
data. It also fixes the fact that '.' was showing up in the dir list
produced by _file_lists(), and updates the associated integration test
to include the cachedir in the mocked opts.
2017-02-15 10:06:17 -07:00
rallytime
e13febe58d Update external_cache docs with other configuration options
There are more places than just the minion config file to define
external job cache configuration settings for minions. This change
updates the docs to include some of those other places and the
order in which they're evaluated if the settings are defined in
more than one place.

Fixes #38762
2017-02-14 17:18:35 -07:00
rallytime
bd1fe03ce7 Update :depends: docs for boto states and modules
Some boto states and modules declare that they depend on the
boto3 lib. That's all good. But some of these states and modules
_also_ depend on the regular boto lib. This updates the docs
to reflect this.

Fixes #39304
2017-02-14 13:33:04 -07:00
Ivan Babrou
e8a2cc0488
Do no try to connect to salt master in syndic config test 2017-02-14 11:16:32 -08:00
Mike Place
8b8ab8ef8e Merge pull request #39362 from dincamihai/cp-push-test-2016.3
Add cp.push test
2017-02-14 11:42:10 -07:00
Mike Place
4b726f955b Merge pull request #39380 from joe-niland/quote-numeric-usernames
Quote numeric user names so pwd.getpwnam handles them properly
2017-02-14 11:33:32 -07:00
Mike Place
1116d32df9 Merge pull request #39400 from meaksh/2016.3-fix-local-cache-issue
Prevents 'OSError' exception in case certain job cache path doesn't exist
2017-02-14 11:27:03 -07:00
Pablo Suárez Hernández
e7e559ef5c Prevents 'OSError' exception in case path doesn't exist 2017-02-14 16:17:26 +00:00
Mihai Dinca
91383c5a19 Add cp.push test 2017-02-14 17:16:28 +01:00
Joe Niland
c2edfdd464 Quote numeric user names so pwd.getpwnam handles them properly 2017-02-14 11:50:35 +11:00
Mike Place
6c854da1d4 Merge pull request #39300 from terminalmage/loader-optimization
Replace more usage of str.format in the loader
2017-02-13 12:01:18 -07:00
Mike Place
5286b5ff1b Merge pull request #39337 from terminalmage/issue34428
Don't re-walk the roots fileserver in symlink_list()
2017-02-13 11:41:16 -07:00
Mike Place
ce781deeb5 Merge pull request #39339 from cro/pillar_filetree_doc
Add link to external pillar documentation for clarification.
2017-02-13 11:40:12 -07:00
C. R. Oldham
410810cea2 Clarification on external pillar usage. 2017-02-11 23:07:38 -07:00
Erik Johnson
a7d2135dc2 Don't re-walk the roots fileserver in symlink_list()
This prevents some unnecessary extra work when getting a list of
symlinks.
2017-02-11 18:28:49 -06:00
Erik Johnson
fa3014393c Document the upstream RedHat bug with their pygit2 package (#39316)
See https://github.com/saltstack/salt/issues/38630#issuecomment-274403448
2017-02-10 16:09:35 -07:00
Nicole Thomas
9de559ff4e Merge pull request #39313 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2017-02-10 09:23:22 -07:00
rallytime
0b8dddf12b Merge branch '2015.8' into '2016.3'
No conflicts.
2017-02-10 08:24:51 -07:00
Nicole Thomas
dd3ca0ecb0 Fix #38595 - Unexpected error log from redis retuner in master's log (#39299) 2017-02-10 08:21:57 -07:00