Commit Graph

70714 Commits

Author SHA1 Message Date
rallytime
4f7ac1431e Create a unit test for the _replace_auth_key function in the ssh module
References Pull Request #39855
2017-03-28 16:27:53 -06:00
Nicole Thomas
7c21153d3a Merge pull request #40300 from meaksh/2016.3-adding-timeouts-parameters-to-cmd_batch
Fixes 'timeout' and 'gather_job_timeout' kwargs parameters for 'local_batch' client
2017-03-24 16:25:21 -06:00
Pablo Suárez Hernández
9174e6f281 Fixes testing opts dict for batch unit tests 2017-03-24 17:22:57 +00:00
Pablo Suárez Hernández
b1de79abcf Adds custom 'timeout' and 'gather_job_timeout' to 'local_batch' client
Fixes 'local_batch' client to be aware of 'timeout' and 'gather_job_timeout' parameters that are coming from kwargs.
2017-03-24 12:23:12 +00:00
Mike Place
0e2d52c3ea Merge pull request #40260 from lubyou/fix-join_domain
Use win32api.FormatMessage to cover more system codes
2017-03-23 15:07:26 -06:00
Mike Place
0c62bb37d3 Merge pull request #40275 from UtahDave/2016.3local
remove reference to auth_minion.
2017-03-23 14:34:43 -06:00
Mike Place
57ce474d73 Merge pull request #40265 from terminalmage/issue40219
Fix two mod_aggregate bugs in pkg states
2017-03-23 13:34:34 -06:00
David Boucha
9f0c9802c2 remove reference to auth_minion.
Support for this option was removed years ago and is no longer needed.
2017-03-23 13:08:51 -06:00
Erik Johnson
1a731e0216 Pop off the version when aggregating pkg states
This squelches a spurious warning that we get due to rewriting the low
data such that the name and version are aggregated under the "pkgs" arg,
with the "version" key remaining in the low chunk.
2017-03-23 11:56:28 -05:00
Erik Johnson
0055fda3e9 Properly aggregate version when passed with name
This fixes an issue in which states which contained a single package
name (no "pkgs" or "sources") paired with a "version" argument, were
having the version ignored. This is because just the name was being
added to the aggregated "pkgs".

Since we're munging low data to aggregate states, this bug wouldn't even
result in the state failing if a different version were installed.
2017-03-23 11:43:00 -05:00
Erik Johnson
62d76f50fc Don't aggregate both name/pkgs and sources in pkg states
Doing so will cause problems trying to install as Salt does not support
installing from both binary packages and repository packages in the same
call to pkg.install.
2017-03-23 11:41:58 -05:00
Mike Place
b208630d85 Merge pull request #40201 from sergeizv/cloud-roster-fixes-2016.3
Cloud roster fixes
2017-03-23 10:28:27 -06:00
Johannes Scholz
1cb15d1ea8 use win32api.FormatMessage() to get the error message for the system code 2017-03-23 16:40:10 +01:00
Mike Place
35ced607dd Merge pull request #40226 from terminalmage/issue40149
Fix wrong errno in systemd.py
2017-03-22 16:31:41 -06:00
Nicole Thomas
24c4ae9c21 Merge pull request #40232 from rallytime/update-release-notes
Update release notes for 2016.3.6
2017-03-22 15:09:34 -06:00
rallytime
2ead188b4f Update release notes for 2016.3.6 2017-03-22 14:21:29 -06:00
Erik Johnson
2a8df9384c Fix wrong errno in systemd.py
Resolves #40149.
2017-03-22 13:34:51 -05:00
Mike Place
c59ae9a82c Merge pull request #39855 from Foxlik/use_regex_to_compare_authorized_keys
Use regular expression instead of split when replacing authorized_keys
2017-03-22 12:28:31 -06:00
Mike Place
fd10430018 Merge pull request #40221 from rallytime/bp-39179
Back-port #39179 to 2016.3
2017-03-22 11:40:34 -06:00
Mike Place
a27a2cc3bb Merge pull request #40206 from cro/sign_pub_take2
Leave sign_pub_messages off by default.
2017-03-22 10:43:03 -06:00
Mike Place
d1abb4cbaa Merge pull request #40193 from rallytime/bp-40117
Back-port #40117 to 2016.3
2017-03-22 10:42:21 -06:00
Mike Place
0f1ff4d4a8 Merge pull request #40196 from twangboy/win_fix_deps
Update dependencies for PyOpenSSL
2017-03-22 10:40:45 -06:00
Michael Calmer
07dc2de084 fix error parsing 2017-03-22 09:23:00 -06:00
C. R. Oldham
01048de83f leave sign_pub_messages off on minion by default. 2017-03-21 14:19:14 -06:00
C. R. Oldham
a82b005507 Leave sign_pub_messages off by default. 2017-03-21 14:10:03 -06:00
Sergei Zviagintsev
d87b377ad2 cloud roster: Don't stop if minion wasn't found in cloud cache index
The cloud roster retrieves a minions's profile, provider and driver
names from the cloud cache index and then issues the show_instance
action to get the minions's IP address. If the minion wasn't found in
the cloud cache index, the cloud roster stops. However, the cloud cache
index is only maintained by the EC2 driver, making the cloud roster only
usable with EC2.

Don't stop if a minion wasn't found in the cloud cache index, trying
show_instance anyway. In this way, although it's impossible to get the
minion's profile, the cloud roster is applicable to cloud providers
other than EC2.
2017-03-21 20:08:24 +01:00
Sergei Zviagintsev
a6865e0283 cloud roster: Check whether show_instance succeeded on node
If the show_instance action failed on a node, the node's name would be
added to a list located at 'Not Actioned/Not Running' key of a
dictionary returned by the action. Ensure that a target node isn't
included into that list.
2017-03-21 20:07:33 +01:00
Sergei Zviagintsev
1b45c8e8c2 cloud roster: Check provider and profile configs for ssh_username
Pass the vm_ variable with provider and profile info to
salt.utils.cloud.ssh_usernames in order to lookup ssh_username not only
in the main salt-cloud config file but in provider and profile
configuration as well. It is the same way all other settings are
retrieved in the cloud roster.
2017-03-21 19:45:27 +01:00
Sergei Zviagintsev
a18250b2e4 cloud roster: Return proper target name
The cloud roster places an instance's info under 'tgt' key in the
dictionary it returns. Because of this salt-ssh reports host name 'tgt'
instead of the specified in the command line. Fix it.
2017-03-21 19:45:27 +01:00
Sergei Zviagintsev
637930b2b3 cloud roster: Fix extracting instance's info
The cloud roster expects an additional nest level when extracting an
instance's info from the result of the show_instance action. It looks
for (which is what show_instance of EC2 driver returned prior to
2016.3):

    info[provider][driver][name][name]

whereas the correct location is

    info[provider][driver][name]

Fix it.
2017-03-21 19:45:27 +01:00
Sergei Zviagintsev
dd1d3aac74 cloud roster: Work with custom conf dir
A path to salt-cloud config file is hardcoded into the cloud roster, so
it won't work with custom conf dir. Remove the hardcoded path and
construct it using __opts__['conf_file'].
2017-03-21 19:45:27 +01:00
Mike Place
b0501515cb Merge pull request #40184 from terminalmage/link-reactor-example
Link to minion start reactor example from FAQ.
2017-03-21 11:33:08 -06:00
twangboy
6761527793 Update dependencies for PyOpenSSL 2017-03-21 11:03:20 -06:00
Narendra Ingale
cf1857904b More optimization. 2017-03-21 10:24:00 -06:00
Narendra Ingale
5a08266814 Removed debug statemnt 2017-03-21 10:24:00 -06:00
Narendra Ingale
f557f7c6bb Added fix for issue 39393 2017-03-21 10:24:00 -06:00
Narendra Ingale
bb62278b73 Reverting changes. 2017-03-21 10:24:00 -06:00
Narendra Ingale
a9107cde44 Added if condition for broken link. 2017-03-21 10:23:59 -06:00
Mike Place
d4e6c58526 Merge pull request #40182 from terminalmage/dockerng-mod_watch-stopped
Add support for "stopped" state to dockerng's mod_watch
2017-03-21 09:40:28 -06:00
Erik Johnson
a42be82993 Link to minion start reactor example from FAQ.
This provides a natural solution to the chicken-and-egg problem
identified in the FAQ. It also changes the name of the event in the
reactor example, as I think we may have stopped sending the legacy
(i.e. not-namespaced) events, so the "minion_start" event in the example
would be incorrect.
2017-03-21 10:01:20 -05:00
Erik Johnson
4629a26fb7 Add support for "stopped" state to dockerng's mod_watch 2017-03-21 09:02:31 -05:00
Nicole Thomas
a0b4082484 Merge pull request #40171 from Ch3LL/2016.3.6_release
additional PRs/issues for 2016.3.6 release notes
2017-03-20 16:14:16 -06:00
Ch3LL
9c6d8d892f additional PRs/issues for 2016.3.6 release notes 2017-03-20 15:45:29 -06:00
Mike Place
33ba7821f7 Merge pull request #40120 from sergeizv/gce-expand-node-fix
gce: Exclude GCENodeDriver objects from _expand_node result
2017-03-20 15:44:41 -06:00
Mike Place
48843977c3 Merge pull request #40122 from meaksh/2016.3-yum-downloadonly-support
Adding "pkg.install downloadonly=True" support to yum/dnf execution module
2017-03-20 15:44:14 -06:00
Nicole Thomas
60e1d4e2f3 Merge pull request #40159 from cro/sign_pub
Turn on sign_pub_messages by default.
2017-03-20 15:00:48 -06:00
Nicole Thomas
e663b761fb Fix small syntax error 2017-03-20 14:06:52 -06:00
C. R. Oldham
0a0f46fb14 Turn on sign_pub_messages by default. Make sure messages with no 'sig' are dropped with error when sign_pub_messages is True. 2017-03-20 11:36:01 -06:00
Erik Johnson
28e4fc17b6 Merge pull request #40123 from twangboy/win_fix_network
Adds support for inet_pton in Windows to network util
2017-03-20 11:25:46 -05:00
Mike Place
35ddb79f59 Merge pull request #40141 from bobrik/fallback-resolve
Use the first address if cannot connect to any
2017-03-20 09:06:56 -06:00