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

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 <adking@redhat.com>
(cherry picked from commit f7e8ee74d5bfb941a5f67d0e03c3845f5cdb1525)
---

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({