Commit Graph

83135 Commits

Author SHA1 Message Date
Erik Johnson
081f42ad71 docker.compare_container: Perform boolean comparison when one side's value is null/None 2017-08-24 17:40:12 -05:00
Mike Place
9da57543f8 Merge pull request #43166 from lomeroe/bp-43116-2017.7
Backport #43116 to 2017.7
2017-08-24 09:01:23 -06:00
Mike Place
44b3caead1 Merge pull request #43056 from damon-atkins/2017.7
safe_filename_leaf(file_basename) and safe_filepath(file_path_name)
2017-08-23 11:35:01 -06:00
Mike Place
6ca9131a23 Merge pull request #43146 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-23 10:56:09 -06:00
lomeroe
af181b3257 correct fopen calls from salt.utils for 2017.7 2017-08-23 11:11:08 -05:00
Mike Place
03f652159f Merge pull request #43123 from twangboy/win_fix_test_which
Fix `unit.utils.test_which` for Windows
2017-08-23 10:01:38 -06:00
Mike Place
5a4fc07863 Merge pull request #43142 from rallytime/bp-43068
Back-port #43068 to 2017.7
2017-08-23 09:56:47 -06:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7'
No conflicts.
2017-08-23 10:08:09 -04:00
Nicole Thomas
0467a0e3bf Merge pull request #43038 from twangboy/win_unit_utils_test_url
Fix `unit.utils.test_url` for Windows
2017-08-23 09:35:24 -04:00
Andreas Thienemann
efc1c8c506 Mark selinux._filetype_id_to_string as public function
_filetype_id_to_string is a private function in the selinux
module.
The selinux state module calls the function as filetype_id_to_string
which fails of course.

Rename the function from the private one to a public one to make
the state call work.

Resolves #42505.
2017-08-23 09:29:29 -04:00
Nicole Thomas
e9ccaa61d2 Merge pull request #43097 from twangboy/win_fix_group
Fix `group.present` for Windows
2017-08-23 09:19:55 -04:00
twangboy
ed97cff5f6 Fix unit.utils.test_which for Windows
This test wasn't really written with Windows in mind. Uses PATHEXT that
actually resembles a Windows environment. The test value has the correct
path seperator for Windows.
2017-08-22 16:59:22 -06:00
lomeroe
f74480f11e lint fix 2017-08-22 17:31:54 -05:00
lomeroe
ecd446fd55 track xml namespace to ensure policies w/duplicate IDs or Names do not
conflict
2017-08-22 17:31:54 -05:00
lomeroe
9f3047c420 add additional checks for ADM policies that have the same ADMX policy ID
(#42279)
2017-08-22 17:31:54 -05:00
Mike Place
8140855627 Merge pull request #43115 from rallytime/bp-42067
Back-port #42067 to 2017.7
2017-08-22 14:09:52 -06:00
Mike Place
1e1a81036c Merge pull request #42962 from twangboy/win_unit_test_doc
Fix `unit.test_doc test` for Windows
2017-08-22 12:06:22 -06:00
Vitaliy Fuks
8a6ad0a9cf Fixed typo. 2017-08-22 13:10:25 -04:00
Vitaliy Fuks
9a5ae2bba1 Removed several uses of name.split('.')[0] in SoftLayer driver.
This code is breaking when server names with multiple periods are used - for
example, name=server1.prod.dc1 domain=example.com. Simply "split and use first
one isn't the reverse operation of "'.'.join([name, domain])" which is done
when VM is created here: 9dcd11c155 (diff-ac8112a3f8d2ebde0edf104797fe64d7)

We've been running with these changes for a while and don't have any issues
creating or destroying instances.

The caveat that some operations (such as destroying) through SoftLayer API
require hostname (without domain) is already documented in Salt and still
applies.
2017-08-22 13:10:17 -04:00
twangboy
43b0360763 Fix lint 2017-08-22 10:54:01 -06:00
Mike Place
ae9d2b7985 Merge pull request #42986 from renner/systemd-notify
Notify systemd synchronously (via NOTIFY_SOCKET)
2017-08-22 10:52:56 -06:00
Mike Place
d347d1cf8f Merge pull request #42995 from twangboy/win_fix_invalid_requisite
Fix malformed requisite for Windows
2017-08-22 10:50:00 -06:00
Mike Place
1c7992a832 Merge pull request #43108 from rallytime/bp-42988
Back-port #42988 to 2017.7
2017-08-22 10:49:26 -06:00
Mike Place
b420fbe618 Merge pull request #43037 from mcarlton00/fix-bhyve-grains
Issue #43036 Bhyve virtual grain in Linux VMs
2017-08-22 10:43:40 -06:00
Nicole Thomas
c6993f4a84 Merge pull request #43107 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-22 12:11:25 -04:00
Mike Place
0a86f2d884 Merge pull request #43100 from vutny/doc-add-missing-utils-ext
[DOCS] Add missing `utils` sub-dir listed for `extension_modules`
2017-08-22 09:40:08 -06:00
Johannes Renner
79c53f3f81 Fallback to systemd_notify_call() in case of socket.error 2017-08-22 15:57:51 +02:00
Tarjei Husøy
1a987cb948 Fix broken negation in iptables
Introduced in 7c6ff77c and released with 2017.7.
2017-08-22 09:43:20 -04:00
rallytime
328dd6aa23 Merge branch '2016.11' into '2017.7'
Conflicts:
  - pkg/osx/pkg-scripts/postinstall
  - pkg/osx/pkg-scripts/preinstall
2017-08-22 09:38:33 -04:00
Johannes Renner
f1765472dd Notify systemd synchronously (via NOTIFY_SOCKET)
Forking the systemd-notify command is known to be unreliable at least
with older versions of the kernel and/or systemd. When systemd receives
the notification the systemd-notify process may have already exited
causing an error in the logs while waiting for a (90 seconds) timeout.

This patch instead notifies the systemd NOTIFY_SOCKET synchronously in
case the systemd.daemon python library is not available.
2017-08-22 13:42:01 +02:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
twangboy
9ffe315d7d Add kwargs 2017-08-21 18:45:11 -06:00
twangboy
4f4e34c79f Fix group state for Windows
group no longer fails when domain is not specified
group.present now accepts group names without domains
local groups are assumed if domain is not specified
documentation improved
moved fix_local_user function to salt.utils.win_functions
now called get_sam_name
2017-08-21 18:39:09 -06:00
Mike Place
e2bf2f448e Merge pull request #42985 from DSRCorporation/bugs/15171_recursion_limit
Properly handle `prereq` having lost requisites.
2017-08-21 16:49:38 -06:00
Mike Place
f9b4976c02 Merge pull request #42996 from twangboy/win_fix_test_stateconf
Fix `unit.test_stateconf` for Windows
2017-08-21 16:43:58 -06:00
Mike Place
19fc644c9b Merge pull request #43024 from twangboy/win_unit_utils_test_find
Fix `unit.utils.test_find` for Windows
2017-08-21 16:38:09 -06:00
twangboy
93390de88b Fix malformed requisite for Windows 2017-08-21 16:27:50 -06:00
Mike Place
1a531169fc Merge pull request #43088 from gtmanfred/2017.7
allow docker util to be reloaded with reload_modules
2017-08-21 16:14:36 -06:00
Mike Place
83e528f0b3 Merge pull request #43091 from mitodl/2017.7
Fixed issue with silently passing all tests in Testinfra module
2017-08-21 16:06:21 -06:00
Mike Place
5482524270 Merge pull request #41994 from twangboy/win_unit_test_cmdmod
Fix `unit.modules.test_cmdmod` on Windows
2017-08-21 15:53:01 -06:00
Mike Place
b33c4abc15 Merge pull request #42933 from garethgreenaway/42873_2017_7_osquery_fix
Fixes to osquery module
2017-08-21 14:48:30 -06:00
Mike Place
e51333306c Merge pull request #43092 from mitodl/2016.11
Fixed issue with silently passing all tests in Testinfra module
2017-08-21 14:22:07 -06:00
Mike Place
53c2115769 Merge pull request #43093 from gtmanfred/ec2
Fix ec2 list_nodes_full to work on 2017.7
2017-08-21 14:21:21 -06:00
Mike Place
77a443ce8e Merge pull request #43060 from twangboy/osx_update_pkg_scripts
Osx update pkg scripts
2017-08-21 14:06:11 -06:00
Daniel Wallace
373a9a0be4 allow docker util to be reloaded with reload_modules
If we reference the actual import, the utils module won't be reloaded, but if
we use `__utils__` it can be reloaded on a pip install
2017-08-21 13:18:08 -06:00
Mike Place
32f9ade4db Merge pull request #43087 from rallytime/bp-42174
Back-port #42174 to 2017.7
2017-08-21 12:40:17 -06:00
Daniel Wallace
c7cffb5a04 This block isn't necessary
If a location isn't passed to list_nodes_full, we can just use get_location().
Of no location is set in the provider, it will just use get_location().

The problem with the lookup if there are profiles, is the way that the
provider/driver was changed in the last release, if it just uses the profile
directly, it will fail when trying to do a full list.

Then for multiple locations being called, each provider has to have a location
in it, and will be called once, as it stands now, if you have multiple
providers, minions from each provider could be doubled up with this lookup.

This change should meet all the needs that this if statement was added for, and not fail in 2017.7
2017-08-21 11:49:21 -06:00
Daniel Wallace
b7283bcc6f _vm_provider_driver isn't needed anymore
We deprecated some of these names in 2017.7, and this function is no longer
needed
2017-08-21 11:49:20 -06:00
Tobias Macey
d4b113acdf
Fixed issue with silently passing all tests in Testinfra module
The Testinfra module had a line where the collection of passed arguments was silently overwritten so that it would not actually perform any assertions. Updated the variable names to address the issue of the parameters being clobbered so that asertions are performed properly.
2017-08-21 13:34:43 -04:00
Tobias Macey
b502560e61
Fixed issue with silently passing all tests in Testinfra module
The Testinfra module had a line where the collection of passed arguments was silently overwritten so that it would not actually perform any assertions. Updated the variable names to address the issue of the parameters being clobbered so that asertions are performed properly.
2017-08-21 13:34:10 -04:00