From: Sebastian Wagner <sewagner@redhat.com>
Date: Tue, 17 Aug 2021 10:30:36 +0000 (+0200)
Subject: mgr/restful: Fix url generation for IPv6 hosts
X-Git-Tag: v16.2.6~13^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9b76c7a8200d1d17751cb987eee318063f34726;p=ceph.git

mgr/restful: Fix url generation for IPv6 hosts

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 98091591e312d27f25e630306c31399180fb90ce)
---

diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py
index df34b160661..4aceccaf154 100644
--- a/src/pybind/mgr/restful/module.py
+++ b/src/pybind/mgr/restful/module.py
@@ -25,6 +25,7 @@ from werkzeug.serving import make_server, make_ssl_devcert
 
 from .hooks import ErrorHook
 from mgr_module import MgrModule, CommandResult
+from mgr_util import build_url
 
 
 class CannotServe(Exception):
@@ -312,10 +313,8 @@ class Module(MgrModule):
 
         # Publish the URI that others may use to access the service we're
         # about to start serving
-        self.set_uri("https://{0}:{1}/".format(
-            self.get_mgr_ip() if server_addr == "::" else server_addr,
-            server_port
-        ))
+        addr = self.get_mgr_ip() if server_addr == "::" else server_addr
+        self.set_uri(build_url(scheme='https', host=addr, port=server_port))
 
         # Create the HTTPS werkzeug server serving pecan app
         self.server = make_server(