From 8a8b17848c119b30a4deec134f9a4f3875d9dfc1 Mon Sep 17 00:00:00 2001 From: Adam King Date: Tue, 30 Apr 2024 13:49:46 -0400 Subject: [PATCH] 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 (cherry picked from commit 04065e34d74421fd1f85b52b87efaf357fe88505) --- src/pybind/mgr/cephadm/services/nvmeof.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/services/nvmeof.py b/src/pybind/mgr/cephadm/services/nvmeof.py index d133ad75d252f..f0fcbfc18c282 100644 --- a/src/pybind/mgr/cephadm/services/nvmeof.py +++ b/src/pybind/mgr/cephadm/services/nvmeof.py @@ -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', -- 2.39.5