From 98091591e312d27f25e630306c31399180fb90ce Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 17 Aug 2021 12:30:36 +0200 Subject: [PATCH] mgr/restful: Fix url generation for IPv6 hosts Signed-off-by: Sebastian Wagner --- src/pybind/mgr/restful/module.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py index 0394861354c8d..e671cb97ab9eb 100644 --- a/src/pybind/mgr/restful/module.py +++ b/src/pybind/mgr/restful/module.py @@ -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( -- 2.39.5