openstack/charm-ceph
Code Issues Proposed changes

Deal with IPv6 addresses

Browse Source
This commit is contained in:
James Page 2014-07-24 15:18:21 +01:00
parent b8188dea95
commit 2074268f9c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hooks/hooks.py
View File

@ -130,15 +130,20 @@ def config_changed():
def get_mon_hosts():
hosts = []
hosts.append('{}:6789'.format(get_public_addr()))
addr = get_public_addr()
if is_ipv6(addr):
hosts.append('[{}]:6789'.format(addr))
else:
hosts.append('{}:6789'.format(addr))
for relid in relation_ids('mon'):
for unit in related_units(relid):
addr = relation_get('ceph-public-address', unit, relid)
if is_ipv6(addr):
addr = '[{}]'.format(addr)
if addr is not None:
hosts.append('{}:6789'.format(addr))
if is_ipv6(addr):
hosts.append('[{}]:6789'.format(addr))
else:
hosts.append('{}:6789'.format(addr))
hosts.sort()
return hosts