]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/rgw: fix setting rgw realm token in secondary site rgw spec 58611/head
authorAdam King <adking@redhat.com>
Thu, 27 Jun 2024 21:09:20 +0000 (17:09 -0400)
committerAdam King <adking@redhat.com>
Mon, 15 Jul 2024 22:25:33 +0000 (18:25 -0400)
commit120dea793bef09d85b4d48dbdaee127fb07eff0d
treec91618e558dbb329080dc7e10fb9f6e9c4773868
parenta8f4f4a52cec3d46e2b995b43581cb76ba4e6fa7
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 <adking@redhat.com>
(cherry picked from commit 95ae364325ddf3acc2ef9bac3e923fe9ca4ef6ba)
src/python-common/ceph/rgw/rgwam_core.py