From e367796d05a44097edd738326b06ca41e28c48fb Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 16 Aug 2021 14:15:23 +0200 Subject: [PATCH] mgr/dashboard: Fix redirect to active MGR Fixes: https://tracker.ceph.com/issues/52117 Signed-off-by: Sebastian Wagner --- src/pybind/mgr/dashboard/module.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py index a42c4a59e39..dc1beb8d982 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -21,8 +21,8 @@ if TYPE_CHECKING: from mgr_module import CLIWriteCommand, HandleCommandResult, MgrModule, \ MgrStandbyModule, Option, _get_localized_key -from mgr_util import ServerConfigException, create_self_signed_cert, \ - get_default_addr, verify_tls_files +from mgr_util import ServerConfigException, build_url, \ + create_self_signed_cert, get_default_addr, verify_tls_files from . import mgr from .controllers import generate_routes, json_error_page @@ -191,13 +191,12 @@ class CherryPyConfig(object): self._url_prefix = prepare_url_prefix(self.get_module_option( # type: ignore 'url_prefix', default='')) - uri = "{0}://{1}:{2}{3}/".format( - 'https' if use_ssl else 'http', - server_addr, - server_port, - self.url_prefix + base_url = build_url( + scheme='https' if use_ssl else 'http', + host=server_addr, + port=server_port, ) - + uri = f'{base_url}{self.url_prefix}/' return uri def await_configuration(self): -- 2.39.5