]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/restful: Fix url generation for IPv6 hosts
authorSebastian Wagner <sewagner@redhat.com>
Tue, 17 Aug 2021 10:30:36 +0000 (12:30 +0200)
committerErnesto Puerta <epuertat@redhat.com>
Tue, 31 Aug 2021 10:33:51 +0000 (12:33 +0200)
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 98091591e312d27f25e630306c31399180fb90ce)

src/pybind/mgr/restful/module.py

index df34b160661bcd719939e746797ec776f125cd68..4aceccaf154c0d9dc6ad69bc1fe0b15f7aafb738 100644 (file)
@@ -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(