Merge lp:~jjo/charms/trusty/rabbitmq-server/use-rabbitmqctl-q-for-list-cmds into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

[JuanJo Ciarlante]

[Jorge Niedbalski (niedbalski)]

LGTM +1

review: Approve

[Billy Olsen (billy-olsen)]

LGTM. Approve. Waiting for OSCI votes before merging

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2190 rabbitmq-server-next for jjo mp251650
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2190/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2400 rabbitmq-server-next for jjo mp251650
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  unit_tests/test_rabbitmq_server_relations.py:6:1: E402 module level import not at top of file
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10520232/
Build: http://10.245.162.77:8080/job/charm_lint_check/2400/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2320 rabbitmq-server-next for jjo mp251650
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [functional_test] Error 1

Full amulet test output: http://paste.ubuntu.com/10520653/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2320/

=== modified file 'hooks/rabbit_utils.py'
--- hooks/rabbit_utils.py	2015-01-22 15:37:28 +0000
+++ hooks/rabbit_utils.py	2015-03-03 20:22:28 +0000
@@ -80,9 +80,9 @@
     Returns a list of all the available vhosts
     """
     try:
-        output = subprocess.check_output([RABBITMQ_CTL, 'list_vhosts'])
+        output = subprocess.check_output([RABBITMQ_CTL, 'list_vhosts', '-q'])
 
-        return output.split('\n')[1:-2]
+        return output.rstrip().split('\n')
     except Exception as ex:
         # if no vhosts, just raises an exception
         log(str(ex), level='DEBUG')
@@ -102,9 +102,9 @@
 
 
 def user_exists(user):
-    cmd = [RABBITMQ_CTL, 'list_users']
+    cmd = [RABBITMQ_CTL, 'list_users', '-q']
     out = subprocess.check_output(cmd)
-    for line in out.split('\n')[1:]:
+    for line in out.rstrip().split('\n'):
         _user = line.split('\t')[0]
         if _user == user:
             admin = line.split('\t')[1]