From: Varsha Rao <varao@redhat.com>
Date: Fri, 22 May 2020 11:50:50 +0000 (+0000)
Subject: qa/tasks/mgr: Don't disable cephadm module
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1168^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=261c769333582247a149ade406ccffe2dce3be23;p=ceph-ci.git

qa/tasks/mgr: Don't disable cephadm module

Fixes: https://tracker.ceph.com/issues/45596
Signed-off-by: Varsha Rao <varao@redhat.com>
---

diff --git a/qa/tasks/mgr/mgr_test_case.py b/qa/tasks/mgr/mgr_test_case.py
index 70faa2a2b4f..37baeb20e41 100644
--- a/qa/tasks/mgr/mgr_test_case.py
+++ b/qa/tasks/mgr/mgr_test_case.py
@@ -73,7 +73,7 @@ class MgrTestCase(CephTestCase):
         # Unload all non-default plugins
         loaded = json.loads(cls.mgr_cluster.mon_manager.raw_cluster_cmd(
                    "mgr", "module", "ls"))['enabled_modules']
-        unload_modules = set(loaded) - {"restful"}
+        unload_modules = set(loaded) - {"cephadm", "restful"}
 
         for m in unload_modules:
             cls.mgr_cluster.mon_manager.raw_cluster_cmd(