From b3f69b10dfa269b29fe417c47189d1dc7608a407 Mon Sep 17 00:00:00 2001 From: Daniel-Pivonka Date: Tue, 24 Mar 2020 15:31:21 -0400 Subject: [PATCH] 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 --- src/cephadm/cephadm | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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]) + ################################## -- 2.39.5