Skip to content

Commit 95ae364

Browse files
committed
mgr/rgw: fix setting rgw realm token in secondary site rgw spec
This was setting a field called "rgw_token" in the rgw spec but this is not a real field in rgw specs. Instead we should be setting "rgw_realm_token" which is what the field is actually called. Setting this nonexistent field causes the spec to be deleted the first time cephadm needs to convert it from a json string back into a python object (which happens whenever the module restarts or the active mgr changes) which then causes all the rgw daemons attached to the service to be removed Fixes: https://tracker.ceph.com/issues/66824 Signed-off-by: Adam King <[email protected]>
1 parent e884e3a commit 95ae364

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/python-common/ceph/rgw/rgwam_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ def zone_create(self, rgw_spec, start_radosgw):
837837
realm_token_b = secondary_realm_token.to_json().encode('utf-8')
838838
realm_token_s = base64.b64encode(realm_token_b).decode('utf-8')
839839
rgw_spec.update_endpoints = True
840-
rgw_spec.rgw_token = realm_token_s
840+
rgw_spec.rgw_realm_token = realm_token_s
841841
rgw_spec.rgw_zonegroup = zonegroup.name # master zonegroup is used
842842
self.env.mgr.apply_rgw(rgw_spec)
843843

0 commit comments

Comments
 (0)