From: Michael Fritch <mfritch@suse.com>
Date: Wed, 7 Oct 2020 19:53:01 +0000 (-0600)
Subject: mgr/cephadm: clean-up NFS rgw keyring
X-Git-Tag: v15.2.8~14^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b21b30afbc9174514abe3bca3d492372496f8f10;p=ceph.git

mgr/cephadm: clean-up NFS rgw keyring

remove RGW keyring during NFS daemon `post_remove`

Fixes: https://tracker.ceph.com/issues/43686
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 219c0c3d1b7f21b9bf1969b3311d313844bdd1e3)
---

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index bdf4205d9b1..21011e1e443 100644
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -153,3 +153,17 @@ class NFSService(CephService):
         })
 
         return keyring
+
+    def remove_rgw_keyring(self, daemon: DaemonDescription) -> None:
+        daemon_id: str = daemon.daemon_id
+        entity: AuthEntity = self.get_auth_entity(f'{daemon_id}-rgw')
+
+        logger.info(f'Remove keyring: {entity}')
+        ret, out, err = self.mgr.check_mon_command({
+            'prefix': 'auth rm',
+            'entity': entity,
+        })
+
+    def post_remove(self, daemon: DaemonDescription) -> None:
+        super().post_remove(daemon)
+        self.remove_rgw_keyring(daemon)