From: Sage Weil <sage@redhat.com>
Date: Wed, 1 Apr 2020 13:28:53 +0000 (-0500)
Subject: mon/MgrMonitor: disable orchestrator_cli if >= octopus
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1561^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9ca9af9750e8bd878d4822135971bd0c47eef8c;p=ceph-ci.git

mon/MgrMonitor: disable orchestrator_cli if >= octopus

Fixes: https://tracker.ceph.com/issues/44883
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index ba3376388da..17852efaf42 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -831,6 +831,15 @@ void MgrMonitor::tick()
     propose = true;
   }
 
+  // obsolete modules?
+  if (mon->monmap->min_mon_release >= ceph_release_t::octopus &&
+      pending_map.module_enabled("orchestrator_cli")) {
+    dout(10) << " disabling obsolete/renamed 'orchestrator_cli'" << dendl;
+    // we don't need to enable 'orchestrator' because it's now always-on
+    pending_map.modules.erase("orchestrator_cli");
+    propose = true;
+  }
+
   if (propose) {
     propose_pending();
   }