From 2de9d6ac201abe220e441c46a4690ea74e801abb Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 25 Mar 2024 13:47:12 -0400 Subject: [PATCH] mgr/cephadm: update zonegroup w/ zonegroup_hostnames from rgw spec If users provide this field to the rgw spec, we need to modify the zonegroup to includes these hostnames. This most just makes use of another commit that added the `ceph rgw zonegroup modify` command to the rgw module for this specific purpose. Signed-off-by: Adam King (cherry picked from commit 3ba87243edb811033d15dcd95322f0517d701f12) --- src/pybind/mgr/cephadm/services/cephadmservice.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index d211bbaa309f4..b786255ee1e00 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -965,6 +965,17 @@ class RgwService(CephService): 'val': cert_data, }) + if spec.zonegroup_hostnames: + zg_update_cmd = { + 'prefix': 'rgw zonegroup modify', + 'realm_name': spec.rgw_realm, + 'zonegroup_name': spec.rgw_zonegroup, + 'zone_name': spec.rgw_zone, + 'hostnames': spec.zonegroup_hostnames, + } + logger.debug(f'rgw cmd: {zg_update_cmd}') + ret, out, err = self.mgr.check_mon_command(zg_update_cmd) + # TODO: fail, if we don't have a spec logger.info('Saving service %s spec with placement %s' % ( spec.service_name(), spec.placement.pretty_str())) -- 2.39.5