valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the -q argument to strip extraneous messages from rabbitmq

Browse Source 
Instead of trying to do it ourselves and worrying about which
version prints 'Listing vhosts...' and '...done' at the beginning
or end of the output or not.

Fixes #26592
This commit is contained in:
rallytime 2015-11-06 17:20:10 -07:00
parent df121d0cec
commit 098fb815af
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/rabbitmq.py
View File

@ -128,11 +128,9 @@ def list_vhosts(runas=None):
''' '''
if runas is None: if runas is None:
runas = salt.utils.get_user() runas = salt.utils.get_user()
res = __salt__['cmd.run']('rabbitmqctl list_vhosts', res = __salt__['cmd.run']('rabbitmqctl list_vhosts -q',
runas=runas) runas=runas).splitlines()
return res
# remove first and last line: Listing ... - ...done
return _strip_listing_to_done(res.splitlines())
def user_exists(name, runas=None): def user_exists(name, runas=None):