From 94031fcba446e26c625038de3ac2cd959acdaa3a Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Wed, 11 Sep 2024 16:37:09 +0530 Subject: [PATCH] mgr/cephadm: use host address while updating rgw zone endpoints During Import zone endpoint automatically fetches hostname instead of ip resulting in sync error. This PR is to fix this issue https://tracker.ceph.com/issues/68027 Signed-off-by: Aashish Sharma (cherry picked from commit 55a2ffb342c24f11c375c88a7f16c7042f6edcea) --- src/pybind/mgr/cephadm/serve.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 561a3e085b8..2cc2044e26f 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -663,7 +663,11 @@ class CephadmServe: for s in self.mgr.cache.get_daemons_by_service(rgw_spec.service_name()): if s.ports: for p in s.ports: - ep.append(f'{protocol}://{s.hostname}:{p}') + if s.hostname is not None: + host_addr = self.mgr.inventory.get_addr(s.hostname) + ep.append(f'{protocol}://{host_addr}:{p}') + else: + logger.error("Hostname is None for service: %s", s) zone_update_cmd = { 'prefix': 'rgw zone modify', 'realm_name': rgw_spec.rgw_realm, -- 2.47.3