valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,849 Commits 24 Branches 182 Tags 341 MiB
14a903ef61
Commit Graph

81849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ch3LL
8c10cbd01d
Skip locale tests on MacOSX 2017-06-05 15:57:20 -04:00
rallytime
903e2f9922 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-05 13:38:51 -06:00
Mike Place
d31e687c79 Merge pull request #41582 from terminalmage/py3-tests 
More debug logging to troubleshoot failing manage runner tests in Python 3
 2017-06-05 12:11:10 -05:00
Erik Johnson
e0f00a2f84 More debug logging to troubleshoot failing manage runner tests in Python 3 
Either the get_cli_event_returns generator is not returning events, or
the events being yielded otherwise are evaluating as False. This line of
debugging code will help determine which is the case.
 2017-06-05 11:14:21 -05:00
Mircea Ulinic
536a6291d4 Add enabling note for the host_dns grain 2017-06-05 09:19:11 +00:00
Mircea Ulinic
7680b7eacf Disable host_dns grain by default 2017-06-05 09:12:48 +00:00
Nicole Thomas
5234ff2f87 Merge pull request #41550 from cloudflare/empty-pass 
More flexible options for the napalm proxy
 2017-06-02 21:11:37 -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
Erik Johnson
14ac8fc271 Fix wording in comment 2017-06-02 14:26:29 -05:00
Nicole Thomas
706d3ccf69 Merge pull request #41560 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-02 11:19:05 -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
33819e9476 Merge pull request #41544 from cloudflare/reconnect-on-err 
Reconnect and re-execute when receiving disconnect
 2017-06-02 11:34:55 -05:00
Mike Place
e97998fa52 Merge pull request #41564 from terminalmage/py3-tests 
Add debug logging for manage.up/down
 2017-06-02 11:20:01 -05:00
Erik Johnson
896a583f83 Add debug logging for manage.up/down 
This adds some debug logging which we can hopefully use to troubleshoot
https://github.com/saltstack/salt-jenkins/issues/341.

Also, this ensures that the lists of up/down minions are always sorted.
This will make future testing more reliable.
 2017-06-02 11:14:45 -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
Mike Place
0386ce968d Merge pull request #41558 from rallytime/salt-cloud-py3 
Various Python 3 fixes for salt-cloud
 2017-06-02 10:28:10 -05:00
rallytime
c617dc0248 Remove duplicate tearDown test functions in tcp unit test 2017-06-02 09:05:29 -06:00
Erik Johnson
cbf8acbafc Redact HTTP basic authentication in archive.extracted 2017-06-02 01:12:08 -05:00
rallytime
cf988e7ad4 Pylint fix 2017-06-01 17:46:44 -06:00
Nicole Thomas
8718033171 Merge pull request #41532 from wasabi222/patch-3 
change default skip_verify to False
 2017-06-01 17:40:58 -06:00
rallytime
80896a785a Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-01 17:15:47 -06:00
Nicole Thomas
ae2ce3f818 Merge pull request #41515 from twangboy/fix_win_file 
Fix makedirs_ function
 2017-06-01 17:10:39 -06:00
rallytime
0c19cab2a1 Fix hexdigest call to use salt's PY3 compatible hash util in gogrid driver 2017-06-01 16:43:50 -06:00
rallytime
d9d07a817d Fix some more places where .keys() is being used improperly for PY3 
The .keys() function itself is fine, it's just what we do after calling
it that matters. Anywhere we try to index the dictionary view will
stacktrace in PY3.
 2017-06-01 16:33:41 -06:00
Nicole Thomas
a49348cc89 Merge pull request #41535 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-01 16:25:35 -06:00
Erik Johnson
c512142899 Add integration test for cp.cache_file 2017-06-01 17:20:58 -05:00
David Murphy
ffe492d6a9 Add symbolic link salt-proxy service similar to other service files 2017-06-01 16:05:46 -06:00
rallytime
655e5fa1d3 Pass in a list as final arg to cloud.filter_event utils call 
The third argument that is passed to the salt.utils.cloud.filter_event
function is supposed to be a list. Most of the places calling this function
were using `foo.keys()`, which returns a list in PY2. But, in PY3, this
is a dictionary view.

This change updates the places where `filter_event` is using `.keys()` and
instead wraps the dict with list(). It also adds some extra type checking
in the filter_event function in case a list is not passed in.
 2017-06-01 12:50:42 -06:00
Erik Johnson
7cff272adf Properly download files when following 30x redirect 
This fixes cases where we did not re-parse the status line after a
redirect, causing the cached file to be zero-size as we ignored the
chunks being downloaded.
 2017-06-01 13:24:32 -05:00
Erik Johnson
d95c23a1a3 Return None when metadata parsing fails 2017-06-01 13:23:55 -05:00
Erik Johnson
bd1f6408cf Put warnings into the warnings field in the state return 
The code that appended them to the comment predates the warnings field
in state returns. This makes the warnings more uniform with the rest of
the Salt codebase.
 2017-06-01 13:22:37 -05:00
Pedro Algarvio
451d8f98e3
The file listing needs to be sorted to return expectable results. 
This seems like the only reasonable way to override, for example, grains.
Grains from `custom_grains_2` should override grains from `custom_grains_1`.
 2017-06-01 18:47:22 +01: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
Pedro Algarvio
3b95ef2345
Partially revert 1b84bee06. Fixes #40517 2017-06-01 18:10:46 +01: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
rallytime
cb69296f55 Remove test_win_firewall unit tests: they don't actually test anything 2017-06-01 10:07:23 -06:00
Nicole Thomas
5295ff2a50 Merge pull request #41526 from DSRCorporation/bugs/py3_tests_nitrogen 
Py3 related tests and code fixes
 2017-06-01 09:16:43 -06:00
Mike Place
5eec523ef8 Merge pull request #41528 from wasabi222/patch-1 
default skip_verify to False
 2017-06-01 09:57:58 -05:00
Mike Place
77420c5c57 Merge pull request #41541 from twangboy/fix_salt-proxy 
Fix salt-proxy on Py2
 2017-06-01 09:54:42 -05:00
Dmitry Kuzmenko
7ba25db473 Replace assertCountEqual not-implemented in Py2 2017-06-01 16:52:09 +03:00
Dmitry Kuzmenko
64954d8e40 Fixed pylint errors. 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2ae68ee591 Added cache test. 
Implemented some time ago, but forgotten.
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
4a2406f178 Py3: fixed some tests. 
tls module: convert bytes to string
gzip util: use BytesIO for 'wb' file
django module: ignore arguments order in assert
pillar module: correctly test pillar merge
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
fef0e0ea67 Catch errors on socket.shutdown. 
It throws an exception if the socket wasn't connected.
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2b3276077c Py3: Fixed schema serialization. Enabled tests back. 2017-06-01 16:49:49 +03:00
Mircea Ulinic
4dbf77b926 More flexible options for the napalm proxy 2017-06-01 13:31:10 +00:00
Mircea Ulinic
07e354049c napalm_syslog engine usage example with host_dns grain 2017-06-01 11:42:53 +00:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00