Commit Graph

76523 Commits

Author SHA1 Message Date
Michael Calmer
07dc2de084 fix error parsing 2017-03-22 09:23:00 -06:00
rallytime
0ba773d86b Skip flaky test for now 2017-03-21 15:47:20 -06:00
Erik Johnson
0b00489eb2 Merge pull request #40209 from sofixa/2016.11
change InfluxDB get_version to expect status code 204
2017-03-21 16:42:25 -05:00
Nicole Thomas
66bc680d0a Merge pull request #40202 from saltstack/revert-39935-namespace_proxy_cfg
Revert "Add special token to insert the minion id into the default_include path"
2017-03-21 15:37:32 -06:00
Adrian Todorov
e1cc7234ff change InfluxDB get_version to expect status code 204 2017-03-21 22:30:39 +01:00
Mike Place
d8f0b79997 Merge pull request #40199 from whiteinge/ponysay-emergency-hotfix
Ponysay emergency hotfix
2017-03-21 15:10:21 -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
C. R. Oldham
bb71710747 Revert "Add special token to insert the minion id into the default_include path" 2017-03-21 13:41:03 -06:00
Nicole Thomas
82cee58e72 Merge pull request #40194 from terminalmage/fix-docker-test-imports
Change imports for dockerng tests
2017-03-21 13:34:54 -06:00
Seth House
85ea61b544 Add depends note 2017-03-21 13:21:25 -06:00
Seth House
5a271acfdc Fix ponysay outputter hardcoded path
Ponies embody the spirit of freedom and that should include the freedom
to put `ponysay` anywhere on the `PATH` that I want.
2017-03-21 13:21:25 -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
0b512f9ffb Merge pull request #40189 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-21 12:02:50 -06: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
Erik Johnson
6caedb0de8 Change imports for dockerng tests
This should fix path issues in the test suite.
2017-03-21 11:56:29 -05:00
David Murphy
a6218b9484 Updated use of tail on Solaris and Sun-like OS 2017-03-21 10:44:44 -06:00
Mike Place
d9cb222aa8 Merge pull request #40034 from sp1r/fix-pillar-scheduling
Disallow modification of jobs from pillar with schedule execution module
2017-03-21 10:36:33 -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
rallytime
a55c4138a8 Merge branch '2016.3' into '2016.11'
No conflicts.
2017-03-21 10:13:56 -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
David Murphy
90e6a1d8f6 Further update to support correct tail in network for Solaris 2017-03-20 15:45:51 -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
Mike Place
257c862c52 Merge pull request #40160 from eldadru/fix-issue-40073-boto-rds-describe-empty-dict
Fix this issue: https://github.com/saltstack/salt/issues/40073, descr…
2017-03-20 15:37:42 -06:00
David Murphy
5b6d33dd70 Fix use of correct tail on Solaris for active_tcp 2017-03-20 15:34:12 -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
Mike Place
aec504173a Merge pull request #40162 from rallytime/archive-integration-test-fixes
Make sure the tornado web server is stopped at the end of the test class
2017-03-20 14:35:20 -06:00
Mike Place
461e15f0f4 Merge pull request #40158 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-20 14:34:22 -06:00
Mike Place
b235f0953f Merge pull request #40165 from rallytime/gate-docker-unit-tests
Don't try to run the dockerng unit tests if docker-py is missing
2017-03-20 14:33:18 -06:00
Nicole Thomas
e663b761fb Fix small syntax error 2017-03-20 14:06:52 -06:00
Nicole Thomas
db9fb58b82 Merge pull request #40085 from cloudflare/fix-ping-tr
VRF arg and better doc for ping and traceroute
2017-03-20 13:48:57 -06:00
rallytime
f32d8a8683 Don't try to run the dockerng unit tests if docker-py is missing 2017-03-20 13:34:15 -06:00
rallytime
dd193cc740 Make sure the tornado web server is stopped at the end of the test class
The tornado web aplication that was set up in the archive tests, and then
duplicated in the remote file integration tests, starts the web server,
but never stops it. This creates a stacktrace that hangs the other test
file that attempts to start the web server.

The Application class has a `listen()` function, but not a `stop()` function.
The change uses the `HTTPServer` class to set up the listening server, but
also has the necessary `stop()` function. (The `listen()` function from the
`Application` class just calls out to the `HTTPServer`'s `listen()` function,
so this works nicely here.)

We can then call the `stop()` function in the `tearDownClass` class method.

I also removed some duplicate STATE_DIR definitions.
2017-03-20 13:08:17 -06:00
Eldad Rudich
954c871332 Fix this issue: https://github.com/saltstack/salt/issues/40073, describe return dictionary returned empty , probably as result of incorrect past merge (see discussion on issue) 2017-03-20 21:05:05 +02:00
rallytime
88f3ebd7e9 Remove extra "connect" kwarg caught by linter 2017-03-20 11:49:14 -06:00