From 228a566382407108028dfc2a792f466a59756665 Mon Sep 17 00:00:00 2001 From: Adam King Date: Sat, 15 Feb 2025 13:55:12 -0500 Subject: [PATCH] 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 --- qa/tasks/cephadm.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 -- 2.39.5