From: Kefu Chai <kchai@redhat.com>
Date: Tue, 20 Jul 2021 03:01:56 +0000 (+0800)
Subject: mon/MgrMonitor: drop nautilus modules from always_on_modules
X-Git-Tag: v17.1.0~1329^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42408%2Fhead;p=ceph.git

mon/MgrMonitor: drop nautilus modules from always_on_modules

the list of always_on_modules for the older versions is only for the
upgrade use case, where the monitor is still the old release, so
we have to keep an entry for the old release in the always_on_modules
map.

but since we don't upgrade from a release older than 2 releases, there
is no need to keep an entry for nautilus.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 1e2b946ec273..ef246e648c6c 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -68,18 +68,6 @@ static ostream& _prefix(std::ostream *_dout, Monitor &mon,
 // the system treats always_on_modules as if they provide built-in functionality
 // by ensuring that they are always enabled.
 const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
-  {
-    CEPH_RELEASE_NAUTILUS, {
-      "crash",
-      "status",
-      "progress",
-      "balancer",
-      "devicehealth",
-      "orchestrator_cli",
-      "rbd_support",
-      "volumes",
-    }
-  },
   {
     CEPH_RELEASE_OCTOPUS, {
       "crash",