From: Redouane Kachach <rkachach@redhat.com>
Date: Tue, 23 May 2023 10:14:20 +0000 (+0200)
Subject: cephadm: delete /tmp/cephadm-<fsid> when removing the cluster
X-Git-Tag: v19.0.0~1094^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c742857d8789f984fe67122bdb32b8d4c1840fe;p=ceph.git

cephadm: delete /tmp/cephadm-<fsid> when removing the cluster
Fixes: https://tracker.ceph.com/issues/61361

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 672c1701155e..a676480d5030 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -7543,7 +7543,7 @@ def command_rm_cluster(ctx):
             p.unlink()
 
     # cleanup remaining ceph directories
-    ceph_dirs = [f'/run/ceph/{ctx.fsid}', f'/tmp/var/lib/ceph/{ctx.fsid}', f'/var/run/ceph/{ctx.fsid}']
+    ceph_dirs = [f'/run/ceph/{ctx.fsid}', f'/tmp/cephadm-{ctx.fsid}', f'/var/run/ceph/{ctx.fsid}']
     for dd in ceph_dirs:
         shutil.rmtree(dd, ignore_errors=True)