]> 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)
committerSebastian Wagner <sewagner@redhat.com>
Wed, 18 Aug 2021 10:08:51 +0000 (12:08 +0200)
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
src/pybind/mgr/restful/module.py

index 0394861354c8dd36092ec22bdadc71e09aa15704..e671cb97ab9eb325ba74105273555f205277451f 100644 (file)
@@ -24,6 +24,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):
@@ -311,10 +312,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(