]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: delete /tmp/cephadm-<fsid> when removing the cluster 53109/head
authorRedouane Kachach <rkachach@redhat.com>
Tue, 23 May 2023 10:14:20 +0000 (12:14 +0200)
committerAdam King <adking@redhat.com>
Wed, 23 Aug 2023 20:01:21 +0000 (16:01 -0400)
Fixes: https://tracker.ceph.com/issues/61361
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 0c742857d8789f984fe67122bdb32b8d4c1840fe)

src/cephadm/cephadm.py

index 593a08f009e9a5bd9a709505333598e4346f010b..52eec7e581d6551a81875baea1de857c01bbdd12 100755 (executable)
@@ -7547,7 +7547,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)