mon/MgrMonitor: update for umbrella

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 38236edaecf9762d526fedcb7257fe8804fee7ab..ec55e9fae106bb3b114c14f23b5ae9540527e8c0 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -80,7 +80,7 @@ Mon
 - [ ] src/test/cli/monmaptool/8.t: update output for monmaptool to X
 - [x] qa/standalone/mon/misc adjust `TEST_mon_features` (add X cases and adjust `--mon-debug-no-require-X`)
 - [x] qa/standalone/mon/misc bump up `jqfilter='.monmap.features.persistent | length == N'` to `N+1`
-- [ ] mon/MgrMonitor.cc adjust `always_on_modules`
+- [x] mon/MgrMonitor.cc adjust `always_on_modules`
 - [ ] common/options/global.yaml.in define `mon_debug_no_require_X`
 - [ ] common/options/global.yaml.in remove `mon_debug_no_require_X-2`
 - [ ] 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 a70e4ab76beca53c1f072c3954e4ae01a7fd12e0..5e85233a3d06e1c093e4fdd0ce7a14825982dcc3 100644 (file)
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -98,6 +98,7 @@ static const std::map<uint32_t, std::set<std::string>>& always_on_modules() {
     { CEPH_RELEASE_REEF, octopus_modules },
     { CEPH_RELEASE_SQUID, octopus_modules },
     { CEPH_RELEASE_TENTACLE, octopus_modules },
+    { CEPH_RELEASE_UMBRELLA, octopus_modules },
   };
   return always_on_modules_map;
 };