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
Erik Johnson
19df3bf731
salt.modules.dockermod: ensure that json.loads is fed a string
...
json.loads can only handle bystrings in 3.x in version 3.6 and later.
2017-06-29 12:51:04 -05:00
Daniel Wallace
26beb18aa5
Set concurrent to True when running states with sudo
...
Fixes #25842
2017-06-29 11:35:28 -06:00
Erik Johnson
bfa9836336
Add the new docker state modules to the toctree
2017-06-29 12:31:58 -05:00
Mike Place
1416bf70b9
Merge pull request #42017 from lorengordon/issue-42013
...
Fixes typo "nozerconf" -> "nozeroconf"
2017-06-29 12:30:48 -05:00
Mike Place
1d552439fe
Merge pull request #42016 from terminalmage/pr-41929
...
Reopen PR #41929 against 2017.7
2017-06-29 12:29:21 -05:00
Mike Place
0ebb50b601
Merge pull request #41906 from terminalmage/numeric-saltenv
...
Better support for numeric saltenvs
2017-06-29 12:19:33 -05:00
Daniel Wallace
06b5a8a5b7
Revert "Fix documentation for docker login function in pre-nitrogen release branches"
...
This reverts commit dfbbeb5946
2017-06-29 11:13:36 -06:00
Mike Place
1b194904f3
Merge pull request #41992 from twangboy/win_unit_test_archive
...
Fix `unit.modules.test_archive` on Windows
2017-06-29 11:53:04 -05:00
Mike Place
d996a82cc4
Merge pull request #42002 from mcalmer/2017.7-fix-kubernetes-serializing
...
Fix serialize error when requesting a node
2017-06-29 11:29:07 -05:00
garethgreenaway
e95f22ab7a
Merge pull request #42004 from vutny/2017-7-fix-croniter-scheduled-jobs
...
[2017.7] Fix crontab-based Master/Minion scheduled jobs
2017-06-29 09:19:33 -07:00
Loren Gordon
b6cf5f2528
Fixes typo nozerconf -> nozeroconf
...
Fixes #42013
2017-06-29 11:46:20 -04:00
Erik Johnson
0837a64394
Express multiple examples as an RST list
2017-06-29 10:01:26 -05:00
Erik Johnson
8ed39ba12b
Clarify the binds configuration when selinux context is present
2017-06-29 09:57:03 -05:00
Benjamin Schubert
4bce6e160f
fixing bad documentation
2017-06-29 09:14:57 -05:00
Benjamin Schubert
15bd41d920
updated documentation for docker bind selinux
2017-06-29 09:14:57 -05:00
Benjamin Schubert
c1600c7a38
udpated docker_container doc for selinux
...
The selinux flags for volumes where missing.
2017-06-29 09:14:57 -05:00
Andrew Bulford
d38199f04f
Fix dockerng.network_* ignoring of tests=True
...
Fixes #41976
2017-06-29 13:47:42 +01:00
Denys Havrysh
6f967acdd7
[2017.7] Fix crontab-based Master/Minion scheduled jobs
2017-06-29 12:09:35 +03:00
Michael Calmer
07f82f934e
Fix serialize error when requesting a node
2017-06-29 11:00:59 +02:00
Mike Place
9f3438d5e7
Merge pull request #42000 from terminalmage/merge-2017.7
...
Merge 2016.11 into 2017.7 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
2017-06-28 21:44:22 -05:00
Mike Place
03e908070b
Merge pull request #41951 from terminalmage/pyobjects-priority
...
Introduce "priority" feature for pyobjects
2017-06-28 21:02:37 -05:00
Erik Johnson
f13ddeb394
Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
...
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
2017-06-28 20:27:32 -05:00
Mike Place
6a3c03c2d5
Merge pull request #41995 from terminalmage/token-umask
...
Temporarily set the umask before writing an auth token
2017-06-28 20:09:47 -05:00
garethgreenaway
e3801b0e78
Merge pull request #41999 from terminalmage/fix-network-test
...
Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips
2017-06-28 18:01:30 -07:00
Erik Johnson
a7f38929cb
Merge pull request #41991 from Da-Juan/fix-state_aggregate-list
...
Accept a list for state_aggregate global setting
2017-06-28 19:58:59 -05:00
Erik Johnson
7424f879a3
Merge pull request #41993 from UtahDave/2016.11local
...
change out salt support link to SaltConf link
2017-06-28 19:55:19 -05:00
Erik Johnson
94316114ee
Add test for pyobjects priority
2017-06-28 19:48:46 -05:00
Erik Johnson
dfd0e51794
Update test_map to test declarative ordering
2017-06-28 19:48:46 -05:00
Erik Johnson
91576a7263
Introduce "priority" feature for pyobjects
...
When there are multiple matches (such as when both an os_family and os
grain both match the minion), the order in which they are processed is
determined by the iteration order of the class' __dict__ attribute.
Since this would be different in different versions of Python, behavior
would be inconsistent depending on which version of Python is being used.
This adds a priority attribute to the Map subclass which, if present,
will re-order the match groups such that the results will be predictable
irrespective of Python version.
2017-06-28 19:48:46 -05:00
Erik Johnson
fb6a93314f
Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips
...
The IP for saltstack.com changed, so this test needs to be updated.
2017-06-28 19:42:52 -05:00
Nicole Thomas
8ed53b818e
Merge pull request #41989 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-06-28 17:12:00 -06:00
Erik Johnson
4f54b0069f
Temporarily set the umask before writing an auth token
2017-06-28 17:07:27 -05:00
twangboy
bf20938f11
Fixes problem with path
2017-06-28 15:02:12 -06:00
David Boucha
bff050ad52
change out salt support link to SaltConf link
2017-06-28 14:54:01 -06:00
Da-Juan
c9075b8f84
Accept a list for state_aggregate setting
...
See #18659
2017-06-28 22:31:06 +02:00
