From: Adam King <adking@redhat.com>
Date: Fri, 7 Feb 2025 21:08:30 +0000 (-0500)
Subject: qa/cephadm: stop cephadm mgr module during cleanup
X-Git-Tag: testing/wip-jcollin-testing-20250820.041311-squid~91^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0f81a2c1120ce2ceb6283aff360b59d8abcc220;p=ceph-ci.git

qa/cephadm: stop cephadm mgr module during cleanup

We recommend this generally when tearing down a cluster
and do so in cephadm-ansible. Doing this avoids any
potential timings where the cephadm mgr module attempts
to undo any daemon removals as we're cleaning up

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 3a3848678bc93e78bd29b0b7e34f701e4720d944)
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 27e0f66d333..09638e7ea56 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -845,6 +845,15 @@ def ceph_bootstrap(ctx, config):
         yield
 
     finally:
+        log.info('Disabling cephadm mgr module')
+        _shell(
+            ctx,
+            cluster_name,
+            bootstrap_remote,
+            ['ceph', 'mgr', 'module', 'disable', 'cephadm'],
+            check_status=False  # can fail if bootstrap failed and mask errors
+        )
+
         log.info('Cleaning up testdir ceph.* files...')
         ctx.cluster.run(args=[
             'rm', '-f',