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

[jjo,gnuoy,r=thedac] jjo: only add neutron-server to HAProxyContext if neutron-api relation is not made, fixes lp#1476394. gnuoy: added unit tests

Browse Source
This commit is contained in:
Liam Young
2015-09-29 07:46:46 +01:00
parent f8b39a8640 401955e919
commit 0af9078ed0
2 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hooks/nova_cc_context.py
View File

@@ -11,6 +11,7 @@ from charmhelpers.core.hookenv import (
related_units,
relations_for_id,
relation_get,
is_relation_made,
unit_get,
)
from charmhelpers.fetch import (
@@ -185,13 +186,14 @@ class HAProxyContext(context.HAProxyContext):
})
listen_ports['osapi_volume_listen_port'] = nvol_api
if neutron.network_manager() in ['neutron', 'quantum']:
port_mapping.update({
'neutron-server': [
api_port('neutron-server'), a_neutron_api]
})
# quantum/neutron.conf listening port, set separte from nova's.
ctxt['neutron_bind_port'] = neutron_api
if not is_relation_made('neutron-api'):
if neutron.network_manager() in ['neutron', 'quantum']:
port_mapping.update({
'neutron-server': [
api_port('neutron-server'), a_neutron_api]
})
# quantum/neutron.conf listening port, set separte from nova's.
ctxt['neutron_bind_port'] = neutron_api
# for haproxy.conf
ctxt['service_ports'] = port_mapping