openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Charm-heleprs sync for AMQP context fix

Browse Source 
In Ocata nova uses the transport_url for communication to rabbitmq.
In the charm the default port 5672 was assumed. However, when
rabbitmq uses SSL it changes the port to 5671.

This pulls in the fix which makes the default port explicit and
changes the port when SSL is in use.

Change-Id: Ic9c24d33550c4c899cabca3667871212dabac1f7
Closes-bug: #1667362
This commit is contained in:
David Ames 2017-02-23 11:43:10 -05:00
parent 98459797bb
commit 86e59d7457
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,7 +393,7 @@ class AMQPContext(OSContextGenerator):
ha_vip_only = False
self.related = True
transport_hosts = None
rabbitmq_port = ''
rabbitmq_port = '5672'
for unit in related_units(rid):
if relation_get('clustered', rid=rid, unit=unit):
ctxt['clustered'] = True
@ -417,6 +417,7 @@ class AMQPContext(OSContextGenerator):
ssl_port = relation_get('ssl_port', rid=rid, unit=unit)
if ssl_port:
ctxt['rabbit_ssl_port'] = ssl_port
rabbitmq_port = ssl_port
ssl_ca = relation_get('ssl_ca', rid=rid, unit=unit)
if ssl_ca: