Commit Graph

83108 Commits

Author SHA1 Message Date
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
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
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
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
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
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
garethgreenaway
882fcd846f Merge pull request #43029 from terminalmage/fix-func-alias
Normalize the salt caching API
2017-08-21 09:54:58 -07:00
Michael Calmer
cf6563645b add support for certificate authentication to kubernetes module 2017-08-21 10:46:29 -04:00
Nicole Thomas
dbee735f6e Merge pull request #43039 from gtmanfred/kube
catch ImportError for kubernetes.client import
2017-08-21 10:32:37 -04:00
Nicole Thomas
1b1b6da803 Merge pull request #43064 from terminalmage/issue42869
Fix race condition in git.latest
2017-08-21 10:29:52 -04:00
Nicole Thomas
c56a8499b3 Merge pull request #43058 from rallytime/fix-release-num
Update release version number for jenkins.run function
2017-08-21 10:13:34 -04:00
Erik Johnson
093c0c2f77 Fix race condition in git.latest
The git.latest state runs a `git ls-remote` on the remote repo to
discover which SHA it should end up at, and whether or not it needs to
fetch from the repo to get the commit it needs. However, since we
fast-forward using a `git merge` to the branch specified in the `rev`
argument, this leaves the state susceptible to a race condition when
someone pushes to the remote repo between when we run the `git
ls-remote` and when we fetch the remote repo. We will successfully
fast-forward to the head of the branch, but that branch will be pointing
to a different commit than the one identified in the `git ls-remote`, so
we will report the state as having failed.

This commit fixes that race condition by fast-forwarding to the commit
identified in the `git ls-remote`, rather than to the branch named by
`rev`.

NOTE: This means that in these edge cases, we will report a `True`
result despite the head of the branch having advanced past the commit to
which we fast-forwarded, but that seems like a reasonable trade-off for
avoiding a race condition. If we repeated the `git ls-remote` after
fetching, we'd just be opening up a window (albeit a smaller one) for
another race condition.
2017-08-18 16:39:01 -05:00
Nicole Thomas
96e8e836d1 Merge pull request #43054 from lorengordon/fix/yumpkg/config-parser
Uses ConfigParser to read yum config files
2017-08-18 16:49:43 -04:00
Arount
3b2cb81a72 fix typo in salt.modules.yumpkg 2017-08-18 14:36:02 -04:00
Arount
38add0e4a2 break if leading comments are all fetched 2017-08-18 14:35:46 -04:00
Arount
d7f65dc7a7 fix configparser import & log if error was raised 2017-08-18 14:35:14 -04:00
Arount
ca1b1bb633 use configparser to parse yum repo file 2017-08-18 14:34:55 -04:00
twangboy
ef8a14cdf9 Remove /opt/salt instead of /opt/salt/bin 2017-08-18 12:19:04 -06:00
twangboy
2dd62aa1da Add more information to the description 2017-08-18 12:09:08 -06:00
twangboy
f44f5b70dc Only stop services if they are running
Otherwise it will cause an error and the installation will fail
2017-08-18 11:52:34 -06:00
twangboy
3b62bf953c Remove salt from the path 2017-08-18 11:44:35 -06:00
twangboy
ebdca3a0f5 Update pkg-scripts
Improves logging
Removes /opt/salt/bin directory before install
Removes symlink to salt-config before install
2017-08-18 11:25:32 -06:00
Nicole Thomas
7b0c94768a Merge pull request #43051 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-18 13:05:57 -04:00
rallytime
153a463b86 Lint: Add missing blank line 2017-08-18 10:59:12 -04:00
rallytime
d7eef70df0 Update release version number for jenkins.run function
This function was added for the 2017.7.0 release, not Carbon.
2017-08-18 09:44:22 -04:00
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
2017-08-18 09:13:54 -04:00