openstack
/
charm-neutron-api
Code Issues Proposed changes

Exclues vip from get_ipv6_addr().

This commit is contained in:
Hui Xiang 2014-09-21 23:12:06 +08:00
parent 7551ee9b21
commit bd86fc63a4
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,10 +414,12 @@ class HAProxyContext(OSContextGenerator):
cluster_hosts = {}
l_unit = local_unit().replace('/', '-')
if config('prefer-ipv6'):
addr = get_ipv6_addr()[0]
addr = get_ipv6_addr(exc_list=[config('vip')])[0]
else:
addr = unit_get('private-address')
cluster_hosts[l_unit] = get_address_in_network(config('os-internal-network'),
addr)

5
hooks/charmhelpers/contrib/openstack/ip.py
View File

@ -66,7 +66,10 @@ def resolve_address(endpoint_type=PUBLIC):
resolved_address = vip
else:
if config('prefer-ipv6'):
fallback_addr = get_ipv6_addr()
list = []
if config('vip'):
list.append(config('vip'))
fallback_addr = get_ipv6_addr(exc_list=list)[0]
else:
fallback_addr = unit_get(_address_map[endpoint_type]['fallback'])
resolved_address = get_address_in_network(

6
hooks/neutron_api_hooks.py
View File

@ -147,7 +147,7 @@ def db_joined():
raise Exception(e)
if config('prefer-ipv6'):
host = get_ipv6_addr()[0]
host = get_ipv6_addr(exc_list=[config('vip')])[0]
else:
host = unit_get('private-address')
@ -263,9 +263,9 @@ def neutron_plugin_api_relation_joined(rid=None):
def cluster_changed():
if config('prefer-ipv6'):
for rid in relation_ids('cluster'):
addr = get_ipv6_addr(exc_list=[config('vip')])[0]
relation_set(relation_id=rid,
relation_settings={'private-address':
get_ipv6_addr()[0]})
relation_settings={'private-address': addr})
CONFIGS.write_all()