From: Daniel-Pivonka <dpivonka@redhat.com>
Date: Tue, 24 Mar 2020 19:31:21 +0000 (-0400)
Subject: cephadm: rm-cluster clean up /etc/ceph
X-Git-Tag: v16.1.0~2740^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34150%2Fhead;p=ceph.git

cephadm: rm-cluster clean up /etc/ceph

rm-cluster command will delete config, keyring, and pub key files from /etc/ceph

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 79b11bc549af3..230d36aeb306f 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3248,6 +3248,19 @@ def command_rm_cluster():
     # rm logrotate config
     call_throws(['rm', '-f', args.logrotate_dir + '/ceph-%s' % args.fsid])
 
+    # clean up config, keyring, and pub key files
+    files = ['/etc/ceph/ceph.conf', '/etc/ceph/ceph.pub', '/etc/ceph/ceph.client.admin.keyring']
+
+    if os.path.exists(files[0]):
+        valid_fsid = False
+        with open(files[0]) as f:
+            if args.fsid in f.read():
+                valid_fsid = True
+        if valid_fsid:
+            for n in range(0, len(files)):
+                if os.path.exists(files[n]):
+                    os.remove(files[n])
+
 
 ##################################