Nicole Thomas
1975fb41bc
Merge pull request #44576 from rallytime/remove-napalm-logging
...
Remove logging from top of napalm util file
2017-11-17 09:55:12 -05:00
Gareth J. Greenaway
3d2f305053
Fixing expected test results.
2017-11-16 16:02:56 -08:00
Nicole Thomas
c2c3048f46
Merge pull request #44575 from Ch3LL/ser_run_test
...
Add service.running integration state test
2017-11-16 17:27:56 -05:00
Gareth J. Greenaway
2c937dc14e
Moving an if statement outside the for loop over the list of chunks.
2017-11-16 14:05:23 -08:00
Gareth J. Greenaway
0a70c673ac
Swapping out the code in call_listen to look in chunks to gather requisites instead of high, which is not always available when call_listen is called.
2017-11-16 13:26:53 -08:00
Gareth J. Greenaway
dea335e3d0
Adding state files used by new integration tests.
2017-11-16 13:26:53 -08:00
Gareth J. Greenaway
dceac5d430
Merge remote-tracking branch 'upstream/develop' into develop
2017-11-16 13:26:29 -08:00
Nicole Thomas
24b1d7af31
Merge pull request #44518 from twangboy/win_fix_verify_env
...
Pass root_dir to the win_verify_env function
2017-11-16 15:57:48 -05:00
Nicole Thomas
7c0398a8bd
Merge pull request #44500 from abhipallav/add-chocolatey-timeout
...
Add support for Chocolatey execution timeout
2017-11-16 15:54:24 -05:00
Nicole Thomas
0300c6be09
Merge pull request #44506 from gugu/develop
...
[kubernetes] Support for Bearer authentication
2017-11-16 15:53:29 -05:00
rallytime
eb91af999e
Remove logging from top of napalm util file
...
Logging should not be done anywhere in a file before a module is
loaded. This includes the `__virtual__()` function as well. This
is because these messages will be logged on every call to the loader,
which muddies the logs when the function(s) being called do not
need to use that particular module.
2017-11-16 15:36:53 -05:00
Ch3LL
7536150567
Add service.running integration state test
2017-11-16 14:12:59 -05:00
Gareth J. Greenaway
784cc7a85a
Merge remote-tracking branch 'upstream/develop' into develop
2017-11-16 09:53:04 -08:00
Ajit Abhipallav
c0eb189050
Add Chocolatey execution timeout support
2017-11-16 23:11:29 +05:30
comsul
f81bb61f2d
check_result: Correctly check the __extend__ state.
...
https://github.com/saltstack/salt/issues/42512
check_state_result() is expecting each highstate item to be a dict, but
states using extend are lists.
Conflicts:
- salt/utils/state.py
2017-11-16 11:51:45 -05:00
Gareth J. Greenaway
d341e12d04
Adding a bit of code to allow using requisites without a module name. Account for using the name without the state module in the requisite. Adding the ability to specify options to the listen state parameter without specifying the state mdoule. Adding state files used by new integration tests.
2017-11-16 08:44:31 -08:00
Ch3LL
b98df6de24
Add known_hosts_file to salt-ssh opts_pkg in wfuncs
2017-11-16 11:10:21 -05:00
Nicole Thomas
1643bb7fd4
Merge pull request #44551 from cloudflare/annoying-tmpnam
...
Removes proxy minions false alarms and security risks
2017-11-16 10:09:13 -05:00
Nicole Thomas
2d0e3a77cc
Merge branch 'develop' into develop
2017-11-16 09:55:05 -05:00
Erik Johnson
0e87a90f8d
Merge pull request #44543 from rallytime/fix-groupadd-tests
...
Groupadd test gid_min/gid_max values should be ints
2017-11-16 06:36:22 -08:00
Andrii Kostenko
4eb3f65776
Support for Bearer authentication
2017-11-16 10:28:31 +02:00
Laurie Denness
f2b2c96e17
Merge branch 'develop' into patch-1
2017-11-15 13:59:26 -05:00
Ch3LL
913eedc699
Add multiple salt-ssh state integration tests
2017-11-15 11:41:28 -05:00
Daniel Wallace
5a8ba39dd7
Merge pull request #44052 from tylerjones4508/docker_util
...
Docker util
2017-11-15 08:51:11 -07:00
Mircea Ulinic
ce1882943d
Use salt.utils.files.mkstemp() instead
2017-11-15 15:14:58 +00:00
Mircea Ulinic
6689bd3b2d
Dont use dangerous os.tmpnam
2017-11-15 13:37:14 +00:00
Mircea Ulinic
2d6176b0bc
Fx2 proxy minion: clean return, like all the other modules
2017-11-15 13:37:08 +00:00
Nicole Thomas
087cbc7eaa
Merge pull request #44529 from cloudflare/add-mandrill-mod
...
Add mandrill mod
2017-11-15 08:25:26 -05:00
Nicole Thomas
60083ac27b
Merge pull request #44541 from terminalmage/fix-yaml-test
...
Fix test to reflect changes in YAML dumper
2017-11-15 08:23:57 -05:00
Tyler Jones
3d77e27830
Merge branch 'develop' into docker_util
2017-11-14 18:25:33 -05:00
Nicole Thomas
4315c20195
Merge branch 'develop' into add-mandrill-mod
2017-11-14 17:29:52 -05:00
Nicole Thomas
62ca0335db
Merge pull request #44540 from vernondcole/saltify-wol-fix-ping
...
fix no __salt__ in salt-cloud
2017-11-14 17:26:53 -05:00
Nicole Thomas
5b8f54084b
Merge branch '2017.7' into fix-yaml-test
2017-11-14 17:25:48 -05:00
Nicole Thomas
58cbf9527f
Merge pull request #44523 from jacobweinstock/add-opts-to-cloud-runner-action-destroy
...
add ability to customize cloud config options in cloud runner functio…
2017-11-14 17:24:06 -05:00
Nicole Thomas
2c6f8f5f9e
Merge pull request #44510 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-14 17:21:13 -05:00
Tom Williams
ba1d57f5eb
Merge branch '2017.7' into infra5978
2017-11-14 16:31:17 -05:00
Tom Williams
021692b6c9
INFRA-5978 - pylint / whitespace fix
2017-11-14 16:29:54 -05:00
Nicole Thomas
5c123eb551
Merge pull request #44538 from gtmanfred/kitchen
...
Fix up some test kitchen stuff
2017-11-14 15:36:55 -05:00
Laurie Denness
16033fbd6a
Clarify error for compound command arguments
...
Previously, if the number of arguments didn't match the number of commands, the error was the same. This might lead you to believe you've not specified enough arguments, when actually, you've supplied too many for the command you're trying to run. This change clarifies which you did. Functionally, no change.
2017-11-14 15:35:45 -05:00
rallytime
37e16cd191
Groupadd test gid_min/gid_max values should be ints
...
This fixes an issue with the groupadd integration tests. There were
two tests failing on CentOS 7 that check to ensure that the gid for
the newly added system group is between the gid_min and gid_max values.
These checks were failing because the test gid was an int, but the
compairison gids (min and max values) were strings, depending on the
distro.
This change ensures that we're compairing ints across the board.
2017-11-14 15:32:39 -05:00
Nicole Thomas
639edfeb9a
Merge pull request #44532 from cloudflare/fix-out-doc
...
Fix a documentation detail of the out execution module
2017-11-14 15:08:42 -05:00
Erik Johnson
958e1aeb8d
Fix test to reflect changes in YAML dumper
...
PR #42064 modified the YAML dumper to display unicode text as a unicode
literal rather than with the !!python/unicode extension prefix. This
updates the test to reflect the change in Salt's behavior.
2017-11-14 13:43:39 -06:00
Nicole Thomas
b6f26166ab
Merge branch 'develop' into infra5854
2017-11-14 14:30:17 -05:00
Nicole Thomas
833a2210f3
Merge pull request #43818 from bodhi-space/infra5669
...
INFRA-5669 - add API throttling handlers to boto_asg exec module
2017-11-14 14:29:10 -05:00
Tyler Jones
ef55f87f63
Merge branch 'docker_util' of github.com:tylerjones4508/salt into docker_util
2017-11-14 18:56:12 +00:00
Tyler Jones
3c8c497e03
Fixing 2 pylint errors, missed server_name
2017-11-14 18:55:30 +00:00
Daniel Wallace
3e04d2d44c
use kitchen-sync for copying files
2017-11-14 11:39:44 -07:00
Daniel Wallace
9bc70fd31b
back up to 2017.7.1 for kitchen tests
...
Until https://github.com/saltstack/salt/pull/44016 is included centos tests need to use 2017.7.1, otherwise it is unable to download the busybox binary.
2017-11-14 11:39:09 -07:00
Tyler Jones
b97bb46666
Merge branch 'develop' into docker_util
2017-11-14 13:08:36 -05:00
Tyler Jones
9f2189c3b1
Adding __context__ and return fixes
2017-11-14 17:56:03 +00:00
