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

Use get_ipv6_addr()[0] directly.

Browse Source
This commit is contained in:
Hui Xiang
2014-09-20 00:09:06 +08:00
parent 5ad6913ab0
commit 3146e68597
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
hooks/nova_cc_context.py
View File

@@ -167,7 +167,7 @@ def canonical_url(vip_setting='vip'):
if is_clustered():
addr = '[%s]' % config(vip_setting)
else:
addr = '[%s]' % get_ipv6_addr()
addr = '[%s]' % get_ipv6_addr()[0]
else:
if is_clustered():
addr = config(vip_setting)

4
hooks/nova_cc_hooks.py
View File

@@ -191,7 +191,7 @@ def db_joined():
raise Exception(e)
if config('prefer-ipv6'):
host = get_ipv6_addr()
host = get_ipv6_addr()[0]
else:
host = unit_get('private-address')
@@ -563,7 +563,7 @@ def cluster_changed():
for rid in relation_ids('cluster'):
relation_set(relation_id=rid,
relation_settings={'private-address':
get_ipv6_addr()})
get_ipv6_addr()[0]})
CONFIGS.write_all()
if is_relation_made('cluster'):