tools/monmaptool: bump new cluster version to X

I don't see a good reason to set this to X-2 for a new cluster so I've adjusted
it to X and updated this missing item in the doc.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index e3807141877c380302007d2cc5c6404cd5b1b883..e9e6451d467f317414ea9021656e197db2dd6bd9 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -73,6 +73,7 @@ Compatsets
 Mon
 ---
 
+- [x] src/tools/monmaptool.cc: bump min_mon_release to X for created (new) clusters
 - [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`
 - [x] mon/MgrMonitor.cc adjust `always_on_modules`

diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index dc882a006a21b278cedc09d93f0c40fd971d2843..b7d2be2b593f27ce39a690cbd65f96814b50d973 100644 (file)
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -358,7 +358,7 @@ int main(int argc, const char **argv)
     monmap.strategy = static_cast<MonMap::election_strategy>(
                  g_conf().get_val<uint64_t>("mon_election_default_strategy"));
     if (min_mon_release == ceph_release_t::unknown) {
-      min_mon_release = ceph_release_t::quincy;
+      min_mon_release = ceph_release_t::tentacle;
     }
     // TODO: why do we not use build_initial in our normal path here!?!?!
     modified = true;