valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,306 Commits 24 Branches 182 Tags 341 MiB
ecb09b8694
Commit Graph

77306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
ecb09b8694 Merge pull request #41639 from dmurphy18/minion_netstat_check 
Update notrim check, netstat takes minutes if large number connections
 2017-06-07 17:03:23 -06:00
Nicole Thomas
2913a33b27 Merge pull request #41611 from garethgreenaway/41309_right_return_res 
Additional fixes to states/saltmod.py
 2017-06-07 16:58:24 -06:00
Mike Place
334a5fc2a0 Merge pull request #41637 from gtmanfred/cmd 
never run bg for onlyif or unless cmd states
 2017-06-07 12:37:46 -05:00
David Murphy
7ab3319090 Update notrim check, netstat takes minutes if large number connections - 260K 2017-06-07 10:47:06 -06:00
Daniel Wallace
40fb6c6249 never run bg for onlyif or unless cmd states 2017-06-07 10:22:46 -06:00
Erik Johnson
34dd9ea862 Merge pull request #41255 from lordcirth/fix-sysctl-test-11 
linux_syctl.default_config(): only return path, don't create it
 2017-06-07 09:13:06 -05:00
Nicole Thomas
4cf577771b Merge pull request #41616 from rallytime/bp-41551 
Back-port #41551 to 2016.11
 2017-06-06 16:44:09 -06:00
Gareth J. Greenaway
fda41ede76 Updating result values to be None for test cases. 2017-06-06 13:01:22 -07:00
darenjacobs
53bca96328 Update __init__.py 
Fix for #35481
 2017-06-06 13:11:12 -06:00
Mike Place
846ca54688 Merge pull request #41552 from Enquier/neutron-floatingip-remove 
Adding logic so that update_floatingip can dissassociate floatingip's
 2017-06-06 13:25:55 -05:00
Mike Place
b720ecb732 Merge pull request #41569 from gtmanfred/fix_test_result_check 
Check all entries in result
 2017-06-06 13:18:16 -05:00
Gareth J. Greenaway
003f2d9323 Following the documentation, when passed the test=True argument the runner and wheel functions should return a result value of False. 2017-06-06 11:16:06 -07:00
Mike Place
d9546c6283 Merge pull request #41599 from garethgreenaway/41540_fixes_to_archive_module 
Fixes to modules/archive.py
 2017-06-06 13:02:13 -05:00
garethgreenaway
10ac80ee96 Merge pull request #41453 from peter-funktionIT/fix_win_pki_state_import_cert 
Update win_pki.py
 2017-06-06 10:15:54 -07:00
garethgreenaway
3335fcbc7d Merge pull request #41557 from dmurphy18/fix-proxy-service 
Add symbolic link for salt-proxy service similar to other serivce files
 2017-06-06 10:13:51 -07:00
Nicole Thomas
65ed230f45 Merge pull request #41597 from rallytime/bp-41533 
Back-port #41533 to 2016.11
 2017-06-06 09:15:09 -06:00
Gareth J. Greenaway
66a136e6d8 Fixing issues raised in #41540 when a zip file is created on a Windows system. The issue has two parts, first directories that end up in the archive end up in the results of aarchive.list twice as they show up as both files and directories because of the logic to handle the fact that Windows doesn't mark them as directories. This issue shows up when an extraction is run a second time since the module verified the file types and the subdirectory is not a file. The second issue is related to permissions, if Salt is told to extract permissions (which is the default) then the directory and files end up being unreadable since the permissions are not available. This change sets the permissions to what the default umask for the user running Salt is. 2017-06-05 20:54:05 -07:00
rallytime
535b8e8d8e Update new pyroute2 unit test to conform with 2016.11 branch standards 2017-06-05 20:55:44 -06:00
Nicole Thomas
bf8aed153d Merge pull request #41596 from rallytime/bp-41487 
Back-port #41487 to 2016.11
 2017-06-05 20:44:17 -06:00
Daniel Wallace
19ea5481b6 remove test that never passed 2017-06-05 17:45:23 -06:00
Peter V. Saveliev
5c86dee73c unit tests: test_pyroute2 -- add skipIf 
... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
026b39493f unit tests: add encoding clause into test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
9ab203d54b unit tests: fix absolute imports in test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
1f507cfa7a unit tests: add pyroute2 interface dict test 
Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
7b497d9ec6 clean up change attribute from interface dict 
The attribute is hidden in IPDB from the high-level logics since
pyroute2 version 0.4.2.

Bug-Url: https://github.com/saltstack/salt/issues/41461
 2017-06-05 17:21:41 -06:00
Nicole Thomas
cc6c98a8d8 Merge pull request #41509 from seanjnkns/fix-keystone-v3-endpoint_present 
Add keystone V3 API support for keystone.endpoint_present|absent
 2017-06-02 21:01:05 -06:00
Daniel Wallace
e2a4d5e1e2 Check all entries in result 
Without this change, we ony check the first return from state tests, if
there is more than one state run, we do not check subsequent tests.
 2017-06-02 17:26:07 -06:00
Mike Place
0a08649637 Merge pull request #41539 from gtmanfred/x509 
allow digest to be empty in create_crl
 2017-06-02 12:00:03 -05:00
Mike Place
3ae8336895 Merge pull request #41561 from terminalmage/issue41154 
Redact HTTP basic authentication in archive.extracted
 2017-06-02 10:33:13 -05:00
Erik Johnson
cbf8acbafc Redact HTTP basic authentication in archive.extracted 2017-06-02 01:12:08 -05:00
David Murphy
ffe492d6a9 Add symbolic link salt-proxy service similar to other service files 2017-06-01 16:05:46 -06:00
CEG
aeed51c1e3 Adding port=None default and documentation 2017-06-01 11:40:13 -06:00
CEG
fcce05e1e4 Adding logic so that update_floatingip can dissassociate floatingip's 
Previously update_floatingip would cause an error if port is set to None.
 2017-06-01 11:34:10 -06:00
Mike Place
39840bfe4e Merge pull request #41436 from skizunov/develop2 
TCP transport: Fix occasional errors when using salt command
 2017-06-01 11:37:42 -05:00
Sergey Kizunov
07d5862773 unit.transport.tcp_test: Clean up channel after use 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-05-31 18:30:19 -05:00
Sergey Kizunov
4b6aec7154 Preserve original IO Loop on cleanup 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-05-31 18:30:19 -05:00
Sergey Kizunov
892c6d4d24 TCP transport: Fix occasional errors when using salt command 
When using the `salt` command, errors would occasionally appear that
look like:

```
File "...\salt\transport\tcp.py", line 883, in _stream_return
AttributeError: 'NoneType' object has no attribute 'StreamClosedError'
```

Upon investigation, it was discovered that in this case,
`SaltMessageClient._stream_return()` was completed after all the modules
such as the one containing `tornado.iostream.StreamClosedError` were
unloaded, so at that time, that symbol evaluated to `None` instead of a
valid exception class.

Instead, we would expect `_stream_return` to be completed at the time
that `SaltMessageClient.close()` is invoked. It was noted that
`_stream_return` was not completed when using the `SyncWrapper`, since
that object turns off the IO Loop immediately when its own future
completes, so that the IO Loop is not running when
`SaltMessageClient.close()` is invoked which doesn't give `_stream_return`
a chance to complete. Even when the IO Loop is closed in
`SyncWrapper.__del__()`, `_stream_return` is not completed. In this case,
it only seems to complete when the Python application shuts down which
is when the error appears.

Fix this issue by allowing the IO Loop to run again until the completion
of a specially created future that completes when `_stream_return` is
exiting.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-05-31 18:30:18 -05:00
Sean Jenkins
095e5949a3 Fix unit tests for PR #41509 2017-05-31 17:22:07 -06:00
Sean Jenkins
eb7ef3c856 Add keystone V3 API support for keystone.endpoint_present|get, endpoint_absent|delete. 
Passing interface to endpoint_present, or absent, will ensure only the given interface
for specified the specified region, is acted upon.

Fixes #41435
 2017-05-31 17:22:07 -06:00
Daniel Wallace
0989be8919 allow digest to be empty in create_crl 2017-05-31 16:48:54 -06:00
Mike Place
06ed4f077b Merge pull request #41337 from Foxlik/2016.11 
Fix #41335 - list index out of range on empty line in authorized_keys
 2017-05-31 14:59:16 -05:00
Mike Place
1ace72d871 Merge pull request #41512 from twangboy/fix_win_status 
Use psutil where possible in win_status.py
 2017-05-31 14:55:59 -05:00
Mike Place
683cc5f414 Merge pull request #41490 from jdsieci/2016.11_selinux 
Backport of SELinux module installation and removal
 2017-05-31 14:37:59 -05:00
peter-funktionIT
d146fd029c Update win_pki.py 
Removed whitespaces on empty line
 2017-05-31 21:11:30 +02:00
twangboy
582d09b484 Get psutil import 2017-05-31 11:03:07 -06:00
Mike Place
2e7e84b8f2 Merge pull request #41522 from jettero/mongodb-keys-are-stupid 
Sadly, you can't have '.'s and '$'s in dict keys in a mongodb doc.
 2017-05-31 10:55:23 -05:00
Paul Miller
12648f5439 dang, thought I already got that. Apparently only got the bottom one. This should do it. 2017-05-31 10:16:22 -04:00
Paul Miller
7c4a763518 ugh, forgot about this lint too. This one looks especially terrible. 2017-05-31 09:38:46 -04:00
Paul Miller
c973988d8d forgot about the linter pass … fixed 2017-05-31 09:06:59 -04:00
Paul Miller
da0d9e4045 Sadly, you can't have '.'s and '$'s in dict keys in a mongodb doc. 2017-05-31 08:10:54 -04:00