openstack/charm-nova-compute
Code Issues Proposed changes

refreshed amqpcontext

Browse Source
This commit is contained in:
yolanda.robla@canonical.com 2014-03-07 11:32:13 +01:00
parent 8960dd5fe4
commit ef0038c70f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hooks/charmhelpers/contrib/openstack/context.py
View File

@ -199,6 +199,7 @@ class AMQPContext(OSContextGenerator):
ctxt = {}
for rid in relation_ids('amqp'):
ha_vip_only = False
for unit in related_units(rid):
if relation_get('clustered', rid=rid, unit=unit):
ctxt['clustered'] = True
@ -213,16 +214,16 @@ class AMQPContext(OSContextGenerator):
unit=unit),
'rabbitmq_virtual_host': vhost,
})
if relation_get('ha_queues', rid=rid, unit=unit):
ctxt['rabbitmq_ha_queues'] = True
ha_vip_only = (relation_get('ha-vip-only', rid=rid, unit=unit) == 'True')
if context_complete(ctxt):
# Sufficient information found = break out!
break
# Used for active/active rabbitmq >= grizzly
if ('clustered' not in ctxt or relation_get('ha-vip-only') == 'True') and \
len(related_units(rid)) > 1:
if relation_get('ha_queues'):
ctxt['rabbitmq_ha_queues'] = relation_get('ha_queues')
else:
ctxt['rabbitmq_ha_queues'] = False
if ('clustered' not in ctxt or ha_vip_only) and len(related_units(rid)) > 1:
rabbitmq_hosts = []
for unit in related_units(rid):
rabbitmq_hosts.append(relation_get('private-address',