From e4ef75bf1ccb8c6be99b81c0d38c5f240ab904a4 Mon Sep 17 00:00:00 2001 From: Adam King Date: Tue, 30 Apr 2024 13:49:16 -0400 Subject: [PATCH] mgr/cephadm: clean up iscsi auth keyring when removing daemon The parent class (CephService) handles the cleanup of the auth keyring Fixes: https://tracker.ceph.com/issues/65717 Signed-off-by: Adam King (cherry picked from commit f7e8ee74d5bfb941a5f67d0e03c3845f5cdb1525) --- src/pybind/mgr/cephadm/services/iscsi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/services/iscsi.py b/src/pybind/mgr/cephadm/services/iscsi.py index 61b157b444c..d2773c19d36 100644 --- a/src/pybind/mgr/cephadm/services/iscsi.py +++ b/src/pybind/mgr/cephadm/services/iscsi.py @@ -160,7 +160,8 @@ class IscsiService(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 iscsi gateways ret, out, err = self.mgr.mon_command({ -- 2.39.5