Commit Graph

54203 Commits

Author SHA1 Message Date
Jeff Quast
a154280b34 bugfix: trailing "...done" in rabbitmq output
Problem
-----------

Some versions of rabbitmq (v3.4.1) does not output any final
"...done" line in output of listings, but the given salt code
unconditionally removed the final line of output, which may
often result in inconsistent behavior of dependent state
functions, where the final line has a value that is significant.

Solution
-----------

This bugfix changes this output manipulation to be conditional,
matching only lines of ``"Listing ..."`` as the first, and
``"...done"`` as the last.

Details
---------

In my environment::

    [rabbitmq@db01 ~]$ rabbitmqctl list_vhosts
    Listing vhosts ...
    /

This causes issues in, for example, a vhost is attempted to
be created for '/' that already exists, if that vhost happens
to be the last one listed in command output, it is thought
non-existent, resulting in state failure::

    Failure: rabbitmq_vhost_|-rabbitmq-vhost_|-/_|-present: Creating vhost "/" ...
    Error: vhost_already_exists: /
2015-06-09 17:30:40 -07:00
Mathieu Le Marec - Pasquet
8fdc9ac025 fix dockerng reference -ng -> ng
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-06-08 19:34:38 +02:00
Nicole Thomas
a10c11ec38 Merge pull request #24499 from rallytime/fix_doc_failure_develop
Added "CLI Example" to make failing test happy on develop
2015-06-08 10:24:21 -06:00
Thomas S Hatch
6c4cef2324 Merge pull request #24478 from nmadhok/vmware-cloud-driver
Vmware cloud driver additions and refactors
2015-06-08 09:27:37 -06:00
Thomas S Hatch
49584e70c0 Merge pull request #24470 from garethgreenaway/refactor_consul_salt_utils_http
Updating consul module to use salt.utils.http instead of requests.
2015-06-08 09:26:29 -06:00
Thomas S Hatch
b351af042d Merge pull request #24450 from ruzarowski/develop
Fix salt cli runs with batch-size set
2015-06-08 09:24:28 -06:00
Gareth J. Greenaway
66e09b1437 Missing import for salt.utils.http 2015-06-08 08:16:25 -07:00
rallytime
49b6ea9798 Added "CLI Example" to make failing test happy on develop 2015-06-08 08:47:56 -06:00
Joseph Hall
7edb687886 Merge pull request #24487 from nmadhok/deprecate-vsphere
Deprecating vsphere cloud driver in favor of vmware cloud driver
2015-06-07 19:51:56 -06:00
Nitin Madhok
e8dab8ae1d Update vmware.py 2015-06-07 21:41:37 -04:00
Nitin Madhok
83babc27b8 Adding CLI Example for random.rand_int so tests don't fail 2015-06-07 21:11:37 -04:00
Nitin Madhok
6246702458 Correct warning message if timeout reached and vmware tools not running 2015-06-07 21:01:55 -04:00
Nitin Madhok
763466cf2e Do not log global exceptions on KeyboardInterrupt 2015-06-07 20:59:03 -04:00
Nitin Madhok
a9a38a20b1 Waiting for vmware tools to be running 2015-06-07 20:55:43 -04:00
Nitin Madhok
308681f4ab Change removed to deprecated 2015-06-07 18:01:25 -04:00
Nitin Madhok
676bf4859c Add deprecation to beryllium release 2015-06-07 17:58:54 -04:00
Nitin Madhok
ceac83dd59 Deprecating vsphere cloud driver in favor of vmware cloud driver 2015-06-07 17:53:33 -04:00
Nitin Madhok
94ebd4bc63 Show same examples for memory 2015-06-07 04:21:07 -04:00
Nitin Madhok
e7b855f9ca adding docs for ability to specify memory in mb and gb 2015-06-07 04:18:53 -04:00
Nitin Madhok
53e508dd20 Ability to specify memory in mb and gb along with other minor fixes 2015-06-07 03:49:09 -04:00
Nitin Madhok
a61516c672 The default for power_on should be True instead of False as per the docs 2015-06-07 02:36:57 -04:00
Justin Findlay
dce1f34ee9 Merge pull request #24454 from rhertzog/rhertzog-patch-1
Strip extraneous newline character added in last environment variable
2015-06-06 17:15:26 -06:00
Justin Findlay
d6a4bd90e9 Merge pull request #24420 from aboe76/add_mod_random_integer/develop
added random integer module to mod_random.py
2015-06-06 08:24:59 -06:00
Michael Steed
83a96367a4 Manual merge of #24414 per thatch45 2015-06-06 07:47:52 -06:00
Gareth J. Greenaway
6f487b6837 lint. wrong variable check in a check. 2015-06-05 22:33:10 -07:00
Gareth J. Greenaway
056eb9a1fd Updating consul module to use salt.utils.http instead of requests. 2015-06-05 21:07:45 -07:00
Thomas S Hatch
dccb83e1ca Merge pull request #24424 from skizunov/develop2
On Windows running salt with admin privileges now authenticates
2015-06-05 18:18:28 -06:00
Raphaël Hertzog
b9c950bc2f Avoid extraneous newline character added in last environment variable
The print statement used to dump the environment associated to the 'runas'
user adds a trailing newline at the end of the string. This newline is
kept and injected in the value of the last environment variable. Most of
the time, it is innocuous but in some cases it can have serious
consequences.

In my case, the last variable was HOME and the trailing newline broke the
command that salt was executing because it was not able to create a file
in the home directory (which was non-existing).

Sponsored-By: Offensive Security
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
2015-06-05 20:13:15 +02:00
Nicole Thomas
98608c8a78 Merge pull request #24423 from garethgreenaway/refactor_random_salt_utils_http
Refactoring random.org module to use salt.utils.http instead of requests
2015-06-05 11:09:17 -06:00
Justin Findlay
ec32648849 Merge pull request #24453 from bechtoldt/pkg_runner_docs
set versionadded Beryllium for salt.runners.pkg
2015-06-05 09:33:53 -06:00
Justin Findlay
cfe1e2cc01 Merge pull request #24442 from ajacoutot/openbsd-network
openbsd: add _openbsd_remotes_on
2015-06-05 09:19:29 -06:00
Justin Findlay
69965de8e2 Merge pull request #24441 from arthurlogilab/patch-6
[doc] Alignement fix on external_auth documentation
2015-06-05 09:15:11 -06:00
Arnold Bechtoldt
9b66f09b83 set versionadded Beryllium for salt.runners.pkg 2015-06-05 16:56:18 +02:00
ruzarowski
e565077006 Merge pull request #1 from ruzarowski/ruzarowski-fix-batch-cli
Fix salt runs with batch-size set
2015-06-05 15:58:20 +02:00
ruzarowski
4419be0c20 Fix salt runs with batch-size set
Because of lacking key extraction in ping response, the response dict is being put into minion list. Extract the key use that instead
2015-06-05 15:57:47 +02:00
Antoine Jacoutot
aacf1ebf08 openbsd: add _openbsd_remotes_on
Helper function to natively returns a set of ipv4 host addresses of both local
and remote established connections without needing to depend on lsof(8).
2015-06-05 12:33:46 +02:00
Arthur Lutz
24502e2655 [doc] Alignement fix on external_auth documentation 2015-06-05 12:32:21 +02:00
Gareth J. Greenaway
c95f8be0ae Updating unit tests based on changes to module. 2015-06-04 20:33:52 -07:00
Gareth J. Greenaway
8d7906bce1 removing unnecessary imports. 2015-06-04 20:33:52 -07:00
Gareth J. Greenaway
e896c4a788 Refactoring random.org module to use salt.utils.http instead of requests 2015-06-04 20:33:52 -07:00
Nicole Thomas
0ca6e26e1c Merge pull request #24432 from rallytime/whitespace
Whitespace fix
2015-06-04 19:31:03 -06:00
rallytime
87fd5355c4 Whitespace fix 2015-06-04 19:24:23 -06:00
Nicole Thomas
80d6e6579c Merge pull request #24431 from rallytime/merge-24417
Merge #24417 with pylint fixes
2015-06-04 18:57:46 -06:00
Nicole Thomas
6b0044ad17 Merge pull request #24421 from bechtoldt/update_docs
add missing module documentation
2015-06-04 18:30:39 -06:00
Nicole Thomas
97104eee8c Merge pull request #24415 from garethgreenaway/refactor_slack_salt_utils_http
Switching slack module and slack returner to using salt.utils.http
2015-06-04 18:25:39 -06:00
Nicole Thomas
b770939605 Merge pull request #24425 from jtand/docstring_rpm
Added example docstring to fix test failures
2015-06-04 18:21:49 -06:00
Nicole Thomas
75890b2818 Merge pull request #24410 from jtand/pkg_resource
Changed mock path to be absolute in test_parse_targets
2015-06-04 18:21:07 -06:00
rallytime
e739a99d9f Merge #24417 with pylint fixes
Refs #24417
2015-06-04 18:17:58 -06:00
Justin
356bfa7f74 Added example docstring to fix test failures 2015-06-04 15:44:56 -06:00
Sergey Kizunov
270267ea16 On Windows running salt with admin privileges now authenticates
On Windows, salt.utils.get_specific_user will now return
'sudo_<username>' when the the client process has administrator
privileges (eg used "Run as administrator" option).

This enables communication with the master if the client and
salt-master processes are run as different users (which is a
common use case when salt-master is run as a service and the
'salt' command is run in an administrator cmd.exe under the
logged in user).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-06-04 16:22:56 -05:00