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 5f28273d40caceab5344253f68a405a919eae86f..3335d1609d77a41b0b559a69c83730ea6fd60e9f 100644 (file)
--- 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