From: Sage Weil <sage@redhat.com>
Date: Tue, 31 Mar 2020 01:49:27 +0000 (-0500)
Subject: mon/MgrMonitor: define mgr modules for pacific
X-Git-Tag: v16.1.0~2624^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=480370827d93162cdab5329718aad7dbe65c8fd6;p=ceph.git

mon/MgrMonitor: define mgr modules for pacific

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 3724221c149..df66f4708c1 100644
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -62,6 +62,7 @@ Compatsets
 Mon
 ---
 
+- [x] mon/MgrMonitor.cc adjust `always_on_modules`
 - [x] common/options.cc define `mon_debug_no_require_X`
 - [x] common/options.cc remove `mon_debug_no_require_X-2`
 - [x] mon/OSDMonitor.cc `create_initial`: adjust new `require_osd_release`, and add associated `mon_debug_no_require_X`
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 431459f7f85..ba3376388da 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -94,6 +94,21 @@ const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
       "pg_autoscaler",
       "telemetry",
     }
+  },
+  {
+    CEPH_RELEASE_PACIFIC, {
+      "crash",
+      "status",
+      "progress",
+      "balancer",
+      "devicehealth",
+      "orchestrator",
+      "rbd_support",
+      "osd_support",
+      "volumes",
+      "pg_autoscaler",
+      "telemetry",
+    }
   }
 };