Merge lp:~gnuoy/charms/trusty/rabbitmq-server/vhost-fix into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

[Liam Young]

The output of rabbitmqctl list_vhosts has changed in the new version (~ 3.4) so that it no longer ends with '...done.' which breaks the current logic of throwing away the last element in the list returned by subprocess.

This mp switches to using '-q' to suppress 'Listing vhosts ...' and '...done.' from the output.

It also stops throwing away '/' from the vhost list since '/' is a valid vhost.

[Billy Olsen (billy-olsen)]

Liam,

This looks mostly fine, but was superceded by JuanJo's MP - lp:~jjo/charms/trusty/rabbitmq-server/use-rabbitmqctl-q-for-list-cmds, which also handled the user listing info. So marking this as disapprove and you can use his.

Billy

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

charm_lint_check #2399 rabbitmq-server-next for gnuoy mp251627
    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/10520230/
Build: http://10.245.162.77:8080/job/charm_lint_check/2399/

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

charm_unit_test #2189 rabbitmq-server-next for gnuoy mp251627
    UNIT OK: passed

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

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

charm_amulet_test #2319 rabbitmq-server-next for gnuoy mp251627
    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/10520603/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2319/

Unmerged revisions

83. By Liam Young on 2015-03-03

Stop throwing away first and last vhosts

=== modified file 'hooks/rabbit_utils.py'
--- hooks/rabbit_utils.py	2015-01-22 15:37:28 +0000
+++ hooks/rabbit_utils.py	2015-03-03 16:58:28 +0000
@@ -80,9 +80,8 @@
     Returns a list of all the available vhosts
     """
     try:
-        output = subprocess.check_output([RABBITMQ_CTL, 'list_vhosts'])
-
-        return output.split('\n')[1:-2]
+        output = subprocess.check_output([RABBITMQ_CTL, '-q', 'list_vhosts'])
+        return output.rstrip().split('\n')
     except Exception as ex:
         # if no vhosts, just raises an exception
         log(str(ex), level='DEBUG')