]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/tasks/cephadm: don't fail if we've already cleaned up conf/keyring
authorAdam King <adking@redhat.com>
Sat, 15 Feb 2025 18:55:12 +0000 (13:55 -0500)
committerAdam King <adking@redhat.com>
Sat, 15 Feb 2025 19:47:39 +0000 (14:47 -0500)
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>
qa/tasks/cephadm.py

index 52b5c75ddedaf84de7025c374df43d3c04b59f29..0eb7c839614ea45fa210e4e28ee1c7a4a2fe24a8 100644 (file)
@@ -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