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>

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 0cde60507180f0ed81043cbc4f02ed62c41a898c..52b5c75ddedaf84de7025c374df43d3c04b59f29 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -882,6 +882,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',