]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: clean up nvmeof keyring when removing daemon 57517/head
authorAdam King <adking@redhat.com>
Tue, 30 Apr 2024 17:49:46 +0000 (13:49 -0400)
committerAdam King <adking@redhat.com>
Thu, 16 May 2024 12:10:11 +0000 (08:10 -0400)
The parent class' (CephService) post_remove handles
keyring cleanup

Fixes: https://tracker.ceph.com/issues/65717
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 04065e34d74421fd1f85b52b87efaf357fe88505)

src/pybind/mgr/cephadm/services/nvmeof.py

index d133ad75d252fa963e533b9852aa22b3c68a63be..f0fcbfc18c282342a42a52bedd10326bf86042c6 100644 (file)
@@ -116,7 +116,9 @@ class NvmeofService(CephService):
         """
         Called after the daemon is removed.
         """
-        logger.debug(f'Post remove daemon {self.TYPE}.{daemon.daemon_id}')
+        # to clean the keyring up
+        super().post_remove(daemon, is_failed_deploy=is_failed_deploy)
+
         # remove config for dashboard nvmeof gateways if any
         ret, out, err = self.mgr.mon_command({
             'prefix': 'dashboard nvmeof-gateway-rm',