From 45c9fe2d3571574b9e0503af108fe7c1567007db Mon Sep 17 00:00:00 2001 From: Zhipeng Liu Date: Thu, 26 Mar 2020 01:58:34 +0800 Subject: [PATCH] Add ipv6 support for novncproxy_base_url. For ipv6 address, we need url with below format [ip]:port Partial-Bug: 1859641 Change-Id: I01a5cd92deb9e88c2d31bd1e16e5bce1e849fcc7 Signed-off-by: Zhipeng Liu --- sysinv/sysinv/sysinv/sysinv/helm/nova.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova.py b/sysinv/sysinv/sysinv/sysinv/helm/nova.py index 8c2f2616c2..7bd4c26372 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/nova.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/nova.py @@ -202,8 +202,12 @@ class NovaHelm(openstack.OpenstackBaseHelm): location = "%s.%s" % (self.NOVNCPROXY_SERVICE_NAME, str(endpoint_domain.value).lower()) else: - location = "%s:%s" % (self._get_oam_address(), - self.NOVNCPROXY_NODE_PORT) + if self._is_ipv6_cluster_service(): + location = "[%s]:%s" % (self._get_oam_address(), + self.NOVNCPROXY_NODE_PORT) + else: + location = "%s:%s" % (self._get_oam_address(), + self.NOVNCPROXY_NODE_PORT) url = "%s://%s/vnc_auto.html" % (self._get_public_protocol(), location) return url