Merge lp:~tealeg/charms/trusty/glance-simplestreams-sync/work-with-multiple-rabbitMQs into lp:~landscape/charms/trusty/glance-simplestreams-sync/landscape

[Geoff Teale]

The charmhelpers library will always set the rabbit_hosts variable to a comma separated string of IP addresses, however the charm expects a python array. This branch produces such an array by splitting the string.

[Данило Шеган (danilo)]

Looks good, will give it a run over the weekend. I assume I can use cs:~tealeg/trusty/glance-simplestreams-sync-0 for testing?

[Alberto Donato (ack)]

LGTM, +1

One nit inline.

review: Approve

[Geoff Teale (tealeg)]

Addressed comments.

[Geoff Teale (tealeg)]

> Looks good, will give it a run over the weekend. I assume I can use
> cs:~tealeg/trusty/glance-simplestreams-sync-0 for testing?

Yup:

juju deploy cs:~tealeg/trusty/glance-simplestreams-sync-0

[Данило Шеган (danilo)]

review: Approve

=== modified file 'scripts/glance-simplestreams-sync.py'
--- scripts/glance-simplestreams-sync.py	2016-03-29 12:27:20 +0000
+++ scripts/glance-simplestreams-sync.py	2016-04-11 10:04:24 +0000
@@ -429,9 +429,13 @@
 
         id_conf = read_conf(ID_CONF_FILE_NAME)
 
+        # The indentity.yaml file contains either a singular string variable
+        # 'rabbit_host', or a comma separated list in the plural variable
+        # 'rabbit_hosts'
+        host = None
         hosts = id_conf.get('rabbit_hosts', None)
         if hosts is not None:
-            host = hosts[0]
+            host = hosts.split(",")[0]
         else:
             host = id_conf.get('rabbit_host', None)