valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,509 Commits 24 Branches 182 Tags 341 MiB
07593675e2
Commit Graph

82509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damon Atkins
4fb2bb1856 Fix typo 2017-07-04 03:08:08 +10:00
twangboy
e4183a6d1c Fix comments 2017-07-03 10:27:04 -06:00
twangboy
984b736e14 Add missing batch file 2017-07-03 10:24:10 -06:00
Daniel Wallace
1c495ced3c pass cachedir from kwargs in cache 2017-07-03 09:55:19 -06:00
Erik Johnson
81d606a8cb Merge pull request #42086 from redmatter/fix-dockerng-volume-present-result 
Make result=true if Docker volume already exists
 2017-07-03 10:48:32 -05:00
Erik Johnson
fc27c1a948 Update mocking in network tests 
017fbdb changed the function calls in such a way that tests in 2017.7
now fail. This updates the mocking to account for new code paths
introduced in this commit.
 2017-07-03 10:43:34 -05:00
Andrew Bulford
2e1dc95500 Make result=true if Docker volume already exists 
In other states the result is always returned as `True` if no change is
required, whether `test=True` is set or not.

Fixes #42076
 2017-07-03 16:19:04 +01:00
Andrew Bulford
8d549685a7 Make result=true if Docker volume already exists 
In other states the result is always returned as `True` if no change is
required, whether `test=True` is set or not.

Fixes #42076
 2017-07-03 16:08:16 +01:00
Erik Johnson
fdb8531724 Merge pull request #42071 from garethgreenaway/42070_state_runs_via_salt_ssh 
fix to ssh/wrapper/state.sls
 2017-07-03 09:43:57 -05:00
Erik Johnson
d942752e95 Fix usage of assert_called_once in Python 3 < 3.6 
This is a more complete fix which builds upon 41c65b0 and covers all
refs to assert_called_once in the suite.
 2017-07-03 09:30:12 -05:00
Damon Atkins
cf55c3361c pkg.install and pkg.remove on the command line take number version numbers, 
store them within a float. However version is a string, to support versions
numbers like 1.3.4

The following for example would not work as version would be a float, and a
float does not match a string a dict with key of strings.
c:\salt\salt-call -l debug pkg.install name=softwarename version=3.1
 2017-07-03 19:27:00 +10:00
Gareth J. Greenaway
e9c8a4a225 When building up the remote file location nothing was being returned via _thin_dir so the remote path was starting with None. This change updates _thin_dir to return a value for format to use. 2017-07-01 17:44:16 -07:00
Mike Place
b95b165d0e Merge pull request #42066 from terminalmage/thin-dir-py3 
salt-ssh: get thin_dir from master_opts if not in opts
 2017-06-30 20:32:22 -05:00
Erik Johnson
7e59d68910 salt-ssh: get thin_dir from master_opts if not in opts 2017-06-30 20:29:25 -05:00
Mike Place
9eb8ea5b33 Merge pull request #42025 from terminalmage/move-mkstemp 
Move salt.utils.files.mkstemp temporarily back to salt.utils
 2017-06-30 20:14:29 -05:00
Erik Johnson
ed1e773dfc Move salt.utils.files.mkstemp temporarily back to salt.utils 
Old code from earlier branches may cause problems when merging forward,
this moves the function back to its old location and we will work on
getting it permanently renamed in develop.
 2017-06-30 18:24:50 -05:00
Mike Place
1bdb2f668b Merge pull request #42061 from terminalmage/fix-loader-subdir 
LazyLoader: fix loading module from a subdir
 2017-06-30 17:44:07 -05:00
Mike Place
5b2ae2dd04 Merge pull request #42062 from terminalmage/arch-grains-test 
Add debug logging for grains tests
 2017-06-30 16:58:15 -05:00
Mike Place
7160697123 Merge pull request #42021 from gtmanfred/2016.11 
Set concurrent to True when running states with sudo
 2017-06-30 16:02:15 -05:00
Mike Place
b784fbbdf8 Merge pull request #42029 from terminalmage/host_to_ips 
Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips
 2017-06-30 15:58:55 -05:00
Mike Place
ec378c73ff Merge pull request #42020 from terminalmage/toctree-fix 
Add the new docker state modules to the toctree
 2017-06-30 15:58:27 -05:00
Mike Place
9548588c79 Merge pull request #42050 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-30 15:58:01 -05:00
Mike Place
3ee31ea25e Merge pull request #42057 from rallytime/ssh-unit-test 
Add mode back in for tmp file creation on Linux for ssh unit test
 2017-06-30 15:54:23 -05:00
Mike Place
e067020b9b Merge pull request #42055 from dmurphy18/handle_gnupgv21 
Upgrade support for gnupg v2.1 and higher
 2017-06-30 15:54:02 -05:00
Erik Johnson
e454abc465 Use existing fpath_dirname variable 
This saves a call to os.path.dirname()
 2017-06-30 15:44:19 -05:00
Erik Johnson
3071bb7a37 Add debug logging for grains tests 
The assert doesn't tell us anything about the grain that is failing.
This adds some debug logging to make this easier to troubleshoot.
 2017-06-30 15:39:48 -05:00
Erik Johnson
629d7eb31a LazyLoader: fix loading module from a subdir 
PRs #41937 and #41963 changed the LazyLoader it so that newer Python
releases (>=3.5) usee importlib instead of imp to load modules. However,
when importlib is in use, and the module is being loaded from a
__init__.py, the importlib.machinery.FileFinder instance is created with
the path to the directory containing the __init__.py, which makes it
impossible to find a match for the desired module.

This commit passes the parent dir when instantiating the FileFinder so
that it can properly locate the module.
 2017-06-30 15:11:42 -05:00
rallytime
f0416acc37 Add mode back in for tmp file creation on Linux 
The mode arg was removed in PR #41966 to get this test to pass on
Windows. However, this caused the same test to fail on Arch Linux
when running Python 3.

Let's keep the test the way it was for non-windows boxes, and only
remove the mode for windows.
 2017-06-30 12:06:54 -06:00
David Murphy
e20cea6350 Upgrade support for gnupg v2.1 and higher 2017-06-30 11:21:49 -06:00
rallytime
c98470e557 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-06-30 10:00:10 -06:00
Mike Place
74ba2abc48 Merge pull request #42048 from Ch3LL/add_11.7 
Add initial 2016.11.7 Release Notes
 2017-06-30 11:00:04 -05:00
Ch3LL
1de5e008a0 Add initial 2016.11.7 Release Notes 2017-06-30 11:32:10 -04:00
Nicole Thomas
0000f0f975 Merge pull request #42037 from rallytime/nitrogen-doc 
Replace some more "Nitrogen" references with 2017.7.0
 2017-06-30 08:31:37 -06:00
Nicole Thomas
951ed4a9c9 Merge pull request #42032 from terminalmage/py3-tests 
Avoid race condition when iterating through processes
 2017-06-30 08:29:54 -06:00
Mike Place
32b73efd2d Merge pull request #42034 from rallytime/fix-41971 
Add the 'provider' key to salt.cloud.CloudClient.create()
 2017-06-30 09:01:19 -05:00
garethgreenaway
a0b537c8b6 Merge pull request #42026 from twangboy/win_unit_test_roots 
Fix `unit.fileserver.test_roots` for Windows
 2017-06-29 17:53:16 -07:00
rallytime
8cd4f62e87 Replace some more "Nitrogen" references with 2017.7.0 2017-06-29 17:33:37 -06:00
Nicole Thomas
ca4e619edb Merge pull request #42024 from leeclemens/doc/selinux 
doc: Specify versionadded for SELinux policy install/uninstall
 2017-06-29 17:29:49 -06:00
Nicole Thomas
e3e576c636 Merge pull request #42009 from redmatter/fix-dockerng-network-ignores-test-2017.7 
Fix dockerng.network_* ignoring of tests=True
 2017-06-29 15:10:38 -06:00
Seth House
50856d0e28 Merge pull request #42030 from whiteinge/revert-py3-doc-chagnes-pt-2 
Re-add msgpack to mocked imports
 2017-06-29 14:47:59 -06:00
rallytime
3b87dbca12 Add the 'provider' key to salt.cloud.CloudClient.create() 
Much like how the 'profile' key exists in this function, the
'provider' key must also exist for other salt-cloud functions
to work properly. Various salt-cloud functions rely on provider
being available (as it is always available when using cloud profiles),
and so it should be available when no profile is used as well.

Also adjusted some rst syntax in the cloud config file as well
as the documentation around the create() function. Passing in
kwargs as the docs originally suggested does not work.

Fixes #41971
 2017-06-29 14:38:09 -06:00
rallytime
a77e1bd9dd Add integration test for salt.cloud.CloudClient.create() function 2017-06-29 14:37:12 -06:00
Erik Johnson
d31939574b Avoid race condition when iterating through processes 
If a process has already exited between when psutil.process_iter() was
invoked, and when we invoke the cmdline() func, it will raise an
exception. This commit catches this exception and skips these processes.
 2017-06-29 15:08:17 -05:00
Seth House
18dfa9893c Re-add msgpack to mocked imports 2017-06-29 13:49:45 -06:00
Erik Johnson
26f848e111 Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips 
This will keep future IP address changes from impacting this test. It
also tests a host which returns an IPv6 address, and a host which cannot
be resolved.
 2017-06-29 14:49:39 -05:00
Mike Place
53031d2f55 Merge pull request #42028 from saltstack/revert-41961-py3_doc 
Revert "Allow docs to be built under Python 3"
 2017-06-29 14:47:46 -05:00
Seth House
5592e6e5d4 Revert "Allow docs to be built under Python 3" 2017-06-29 13:32:09 -06:00
twangboy
cdb53c2657 Set file_roots for Windows Temp 2017-06-29 13:01:10 -06:00
Erik Johnson
fae46649e4 Merge pull request #42019 from gtmanfred/docker 
Revert docker documentation from pre nitrogen release that was merged forward.
 2017-06-29 13:49:26 -05:00
Lee Clemens
b63a3c0fae doc: Specify versionadded for SELinux policy install/uninstall 2017-06-29 14:36:25 -04:00