Commit Graph

87363 Commits

Author SHA1 Message Date
twangboy
0040082d0a
Fix pylint error 2017-10-19 13:31:06 -06:00
twangboy
91258cd6a8
Fix typo 2017-10-19 13:31:05 -06:00
twangboy
261dba347d
Put the file.remove in a try/except/else block 2017-10-19 13:31:05 -06:00
twangboy
020c2a2b85
Fix syntax error 2017-10-19 13:31:05 -06:00
twangboy
d5bec99126
Fix some lint 2017-10-19 13:31:05 -06:00
twangboy
b96186d60d
Fix INSTALL_LANGUAGE
Replace `_` with `-`
Instead of taking the first 2 elements of the language code to find the
abbreviated language code, do a split off the `-` and take the first
element.
2017-10-19 13:31:04 -06:00
twangboy
5471bd521f
Fix problem with file handle
Use with io.open so the handle is realeased automatically....
Use `closed` to detect failure to release the file handle and continue
to close until successful
Use `__opts__` to get `cachedir` instead of __salt__
2017-10-19 13:31:04 -06:00
twangboy
5ec58c6200
Use System Install Language as default fallback 2017-10-19 13:31:04 -06:00
twangboy
f9ad446019
Fix win_lgpo execution module
The _processPolicyDefinitions fuction loads the adml files for the
corresponding admx. The adml file usually resides in a sub folder in the
C:\Windows\PolicyDefinitions directory that is the language code. The
default is `en-US`.
When the System Center Operations Manager (SCOM) agent is installed, it
adds some addition policy definitions. However, the corresponding adml
files are not in the standard location (`en-US`). Instead they are placed
in the `en` directory.
This PR will cause the win_lgpo module to check in the `en-US` directory
first and then check the `en` directory if still not found.
2017-10-19 13:31:04 -06:00
twangboy
a862e0bf2d
Remove unneeded import 2017-10-19 13:30:16 -06:00
twangboy
d78f27466d
Fix unit.states.test_mount for Windows
Use `os.path.realpath` to convert paths
Mock `os.path.exists`
2017-10-19 13:30:16 -06:00
Erik Johnson
0692f442db yumpkg: Check pkgname instead of name to see if it is a kernel pkg
We should have been checking pkgname instead of name all along, but this
never bit us until 6638749 started passing `None` for the name param.
2017-10-19 13:54:03 -05:00
Tom Williams
5c66a38b50 INFRA-5825 - add delete_{ingress,egress}_rules params to boto_secgroup 2017-10-19 13:55:38 -04:00
twangboy
64d2e4f732
Fix pickling errors on Windows
Moves the 4 sub functions to the global scope
2017-10-19 11:50:23 -06:00
Nicole Thomas
f0175623ed Merge branch 'develop' into ssh_known_hosts_improvements 2017-10-19 13:44:29 -04:00
Gareth J. Greenaway
7eef3b3571
Adding a copy.deepcopy to the for loop that looks for old jobs to avoid stale jobs ending up in the list. 2017-10-19 10:39:11 -07:00
Nicole Thomas
e322b7c92a Merge branch 'develop' into fix_requests_ssl_verify_error 2017-10-19 13:36:45 -04:00
Sergey Kacheev
56c91f0895 Add requests verify option in vault section
This fix allow pass requests 'verify' option from vault configs
If vault certificate signed with Intermediate CA,
and Intermedia CA sign by internal root CA,
requests will fail verifying vault certificate with error:

 _ssl.c:510: ... routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed

'verify' option allow explicitly specify ca-bundle, or disable verifications.
http://docs.python-requests.org/en/master/user/advanced/#ssl-cert-verification
2017-10-20 00:11:29 +07:00
Vernon Cole
4c8cd9c507
lint and comment fixes 2017-10-19 10:16:28 -06:00
Nicole Thomas
05d91f44f4 Whitespace fix 2017-10-19 11:44:17 -04:00
Nicole Thomas
6052bef2f4 Fixup warn_until messages
This change also updates the `salt.utils.warn_until` path to the new `salt.utils.versions.warn_util` path.
2017-10-19 10:28:27 -04:00
Nicole Thomas
34a843252d Merge pull request #44157 from benediktwerner/2017.7
Added 'versionadded' tags to sensehat modules
2017-10-19 10:13:30 -04:00
Nicole Thomas
1427c72e1e Merge pull request #44164 from terminalmage/fix-docker-docstring
Fix examples in docker_container.{stopped,absent} docstrings
2017-10-19 10:12:36 -04:00
Nicole Thomas
77969c4161 Merge pull request #44168 from twangboy/win_skip_pam_eath
Fix `unit.test_auth` for Windows
2017-10-19 10:12:21 -04:00
Nicole Thomas
b59cd3698e Merge pull request #44177 from senthilkumar-e/redis_doc_update
Fixing default redis.host in documentation
2017-10-19 09:38:30 -04:00
Nicole Thomas
e52aac2587 Merge pull request #43649 from twangboy/win_installer_multimaster
Add support for multimaster setup
2017-10-19 09:20:44 -04:00
Nicole Thomas
f77fa8ec26 Merge pull request #44159 from benediktwerner/fix-shadow-test
Fix shadow module unit test if not root or the module is not present
2017-10-19 09:14:08 -04:00
Pratik Bandarkar
ed38db2702 create route to send traffic by natting for_GCP
A route is a rule that specifies how certain packets should be handled by the
virtual network. Routes are associated with virtual machine instances by tag,
and the set of routes for a particular VM is called its routing table.
For each packet leaving a virtual machine, the system searches that machine's
routing table for a single best matching route.

This module will create a route to send traffic destined to the Internet
through your gateway instance.
2017-10-19 09:31:16 +00:00
Senthilkumar Eswaran
44e37bf6e5 Fixing default redis.host in documentation 2017-10-18 22:08:26 -07:00
Vernon Cole
2b4f69e1f8
remove unused parameter 2017-10-18 20:20:36 -06:00
Vernon Cole
cce7bc9719
add more unit tests 2017-10-18 20:06:14 -06:00
Benedikt Werner
4bfeb7f1d1
Fixed missing import 2017-10-19 03:17:16 +02:00
Gareth J. Greenaway
8bbb1088e8
Fixing lint. 2017-10-18 14:57:33 -07:00
Gareth J. Greenaway
1e312d1b59
Adding tests for _memdata, Linux & *BSD 2017-10-18 14:57:33 -07:00
Gareth J. Greenaway
9f99c304a3
moving specific platform memdata code into specific platform functions. 2017-10-18 14:57:32 -07:00
Gareth J. Greenaway
bcee88ce77
Adding note about new swap_total grain to release notes for Oxyten. 2017-10-18 14:57:32 -07:00
Gareth J. Greenaway
aed80a3c8d
Provide a grain for total amount of swap for Linux, *BSD, OS X and Solaris/SunOS 2017-10-18 14:57:32 -07:00
Ch3LL
cd79e9444e
remove unneded kwarg 2017-10-18 17:21:52 -04:00
Ch3LL
1541376c4f
Add spm build test 2017-10-18 17:15:42 -04:00
twangboy
bb1d2eb85b
Skip tests that are failing on PAM eauth 2017-10-18 14:03:10 -06:00
Gareth J. Greenaway
5f7555846f
When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable. 2017-10-18 12:51:29 -07:00
Nicole Thomas
3d5e3e51e9 Merge pull request #43454 from kunal-bajpai/fix_returner_core
Fix save_load which is never called for returner jobs
2017-10-18 15:39:12 -04:00
Erik Johnson
7b46489e33 Fix examples in docker_container.{stopped,absent} docstrings
These were erroneously changed from `dockerng.{stopped,absent}` to
`docker.{stopped,absent}` using sed, when they should have been changed
to reflect the new name of this state module (like the
`docker_container.running` examples were).
2017-10-18 13:34:11 -05:00
rallytime
832aa3010c
Reorder and group imports in jina template unit tests
The imports were scattered around quite a bit, which made it hard
to see where multiple uses of salt/utils/* imports were being pulled
in.

This PR just adjusts the ordering so it's easier to see what is included
already for the future. (This is particularly useful for catching misuses
of salt.utils.__init__.py functions.)
2017-10-18 14:15:50 -04:00
kstreee
e210f12cb7
Fixes inconsistent exception handling in rest_tornado. 2017-10-19 02:22:23 +09:00
Benedikt Werner
77b948b00a
Skip shadow module unit test if not root or no shadow 2017-10-18 19:10:55 +02:00
Benedikt Werner
bd825b51cc
Changed sensehat versionadded from 2017.7 to 2017.7.0 2017-10-18 19:08:59 +02:00
Vasili Syrakis
534faf0b7a
Catch on empty Virtualbox network addr #43427 2017-10-18 13:00:25 -04:00
Benedikt Werner
f1d3c5bbcf
Added 'versionadded' tags to sensehat modules 2017-10-18 18:54:54 +02:00
Nicole Thomas
23deab2f4d Merge branch 'develop' into boto_asg 2017-10-18 12:52:58 -04:00