From: Adam King <adking@redhat.com>
Date: Sat, 15 Feb 2025 18:55:12 +0000 (-0500)
Subject: qa/tasks/cephadm: don't fail if we've already cleaned up conf/keyring
X-Git-Tag: testing/wip-pdonnell-testing-20250220.015803-debug~15^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=228a566382407108028dfc2a792f466a59756665;p=ceph-ci.git

qa/tasks/cephadm: don't fail if we've already cleaned up conf/keyring

We run this rm command after the `cephadm rm-cluster`
which is also meant to clean these up. Honestly, I have no idea
why this wasn't already failing

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 52b5c75dded..0eb7c839614 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -926,11 +926,14 @@ def ceph_bootstrap(ctx, config):
         )
 
         # clean up /etc/ceph
-        ctx.cluster.run(args=[
-            'sudo', 'rm', '-f',
-            '/etc/ceph/{}.conf'.format(cluster_name),
-            '/etc/ceph/{}.client.admin.keyring'.format(cluster_name),
-        ])
+        ctx.cluster.run(
+            args=[
+                'sudo', 'rm', '-f',
+                '/etc/ceph/{}.conf'.format(cluster_name),
+                '/etc/ceph/{}.client.admin.keyring'.format(cluster_name),
+            ],
+            check_status=False,  # rm-cluster above should have cleaned these up
+        )
 
 
 @contextlib.contextmanager