From 826460338453f7d6749428f6b6a2db04b75e4df6 Mon Sep 17 00:00:00 2001 From: Henry Hirsch Date: Wed, 20 Jul 2022 10:11:00 +0200 Subject: [PATCH] mgr/dashboard: fix rgw connect when using ssl connecting with the hostname instead of the ip address when using ssl Fixes: http://tracker.ceph.com/issues/56970 Signed-off-by: Henry Hirsch (cherry picked from commit ca8f77d6a7fa361328a942e3f37c81dd9577d4de) --- src/pybind/mgr/dashboard/services/rgw_client.py | 2 +- src/pybind/mgr/dashboard/tests/__init__.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/dashboard/services/rgw_client.py b/src/pybind/mgr/dashboard/services/rgw_client.py index 915f6d7fe17c..4c401f2a42ae 100644 --- a/src/pybind/mgr/dashboard/services/rgw_client.py +++ b/src/pybind/mgr/dashboard/services/rgw_client.py @@ -85,7 +85,7 @@ def _determine_rgw_addr(daemon_info: Dict[str, Any]) -> RgwDaemon: Parse RGW daemon info to determine the configured host (IP address) and port. """ daemon = RgwDaemon() - daemon.host = _parse_addr(daemon_info['addr']) + daemon.host = daemon_info['metadata']['hostname'] daemon.port, daemon.ssl = _parse_frontend_config(daemon_info['metadata']['frontend_config#0']) return daemon diff --git a/src/pybind/mgr/dashboard/tests/__init__.py b/src/pybind/mgr/dashboard/tests/__init__.py index 6f807e122b18..af264b3b16ab 100644 --- a/src/pybind/mgr/dashboard/tests/__init__.py +++ b/src/pybind/mgr/dashboard/tests/__init__.py @@ -315,7 +315,8 @@ class RgwStub(Stub): 'id': 'daemon1', 'realm_name': 'realm1', 'zonegroup_name': 'zonegroup1', - 'zone_name': 'zone1' + 'zone_name': 'zone1', + 'hostname': 'daemon1.server.lan' } }, '5398': { @@ -325,7 +326,8 @@ class RgwStub(Stub): 'id': 'daemon2', 'realm_name': 'realm2', 'zonegroup_name': 'zonegroup2', - 'zone_name': 'zone2' + 'zone_name': 'zone2', + 'hostname': 'daemon2.server.lan' } } }}}}) -- 2.47.3