From: Sage Weil <sage@newdream.net>
Date: Tue, 16 Mar 2021 16:58:52 +0000 (-0400)
Subject: mgr/cephadm: rgw: clean up config and config-key values on removal
X-Git-Tag: v17.1.0~2562^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4841093c7643c907934c684800a44e85ce873990;p=ceph.git

mgr/cephadm: rgw: clean up config and config-key values on removal

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index 1812ebc38176..ea48c5321f75 100644
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -800,6 +800,30 @@ class RgwService(CephService):
                                               'osd', 'allow rwx tag rgw *=*'])
         return keyring
 
+    def purge(self, service_name: str) -> None:
+        self.mgr.check_mon_command({
+            'prefix': 'config rm',
+            'who': utils.name_to_config_section(service_name),
+            'name': 'rgw_realm',
+        })
+        self.mgr.check_mon_command({
+            'prefix': 'config rm',
+            'who': utils.name_to_config_section(service_name),
+            'name': 'rgw_zone',
+        })
+        self.mgr.check_mon_command({
+            'prefix': 'config-key rm',
+            'key': f'rgw/cert/{service_name}',
+        })
+
+    def post_remove(self, daemon: DaemonDescription) -> None:
+        super().post_remove(daemon)
+        self.mgr.check_mon_command({
+            'prefix': 'config rm',
+            'who': utils.name_to_config_section(daemon.name()),
+            'name': 'rgw_frontends',
+        })
+
     def ok_to_stop(
             self,
             daemon_ids: List[str],