From 29665b53383a966453357545107f03213d4124c4 Mon Sep 17 00:00:00 2001 From: Jorge Niedbalski Date: Mon, 20 Mar 2017 10:10:13 -0300 Subject: [PATCH] Properly format IPv6 monitor address. This change uses format_ipv6_address for ipv6 addresses for using brackets. Partial-Bug: #1659645 Change-Id: I7d5b9b85e86176643cb5277969d57da5fec6eeee Signed-off-by: Jorge Niedbalski --- requires.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requires.py b/requires.py index 688f02e..492b00a 100644 --- a/requires.py +++ b/requires.py @@ -6,6 +6,8 @@ from charms.reactive import RelationBase from charms.reactive import scopes from charmhelpers.core import hookenv from charmhelpers.core.hookenv import log, service_name +from charmhelpers.contrib.network.ip import format_ipv6_addr + from charmhelpers.contrib.storage.linux.ceph import ( CephBrokerRq, is_request_complete, @@ -112,7 +114,6 @@ class CephClient(RelationBase): hosts = [] addrs = self.get_remote_all('ceph-public-address') for addr in addrs: - hosts.append('{}:6789'.format(addr)) - + hosts.append('{}:6789'.format(format_ipv6_addr(addr) or addr)) hosts.sort() return hosts