From: Adam King <adking@redhat.com>
Date: Tue, 30 Apr 2024 17:49:46 +0000 (-0400)
Subject: mgr/cephadm: clean up nvmeof keyring when removing daemon
X-Git-Tag: v18.2.5~410^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F59459%2Fhead;p=ceph.git

mgr/cephadm: clean up nvmeof keyring when removing daemon

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)

Conflicts:
	src/pybind/mgr/cephadm/services/nvmeof.py
---

diff --git a/src/pybind/mgr/cephadm/services/nvmeof.py b/src/pybind/mgr/cephadm/services/nvmeof.py
index 5f28273d40ca..3335d1609d77 100644
--- a/src/pybind/mgr/cephadm/services/nvmeof.py
+++ b/src/pybind/mgr/cephadm/services/nvmeof.py
@@ -84,6 +84,8 @@ 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)
         # TODO: remove config for dashboard nvmeof gateways if any
         # and any certificates being used for mTLS