mon/MonCommands: require-osd-release pacific

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

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index dbf9612fa8f7edd32b4e4655e339d04f8e505ae9..0a1ce18640ad12da86ff45cef8afa1a95376e49d 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -69,6 +69,7 @@ Mon
 - [x] mon/OSDMonitor.cc `create_initial`: adjust new `require_osd_release`, and add associated `mon_debug_no_require_X`
 - [x] mon/OSDMonitor.cc `preprocess_boot`: adjust "disallow boot of " condition to disallow X if `require_osd_release` < X-2.
 - [x] mon/OSDMonitor.cc: adjust "osd require-osd-release" to (1) allow setting X, and (2) check that all mons *and* OSDs have X
+- [x] mon/MonCommands.h: adjust "osd require-osd-release" allows options to include X
 - [x] qa/workunits/cephtool/test.sh: adjust `require-osd-release` test
 
 

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index d1cbd336e8f55f16db11b2769936380fc0b79ae8..bc84a0bee92b9059387394041d4fefd97bad266f 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -794,7 +794,7 @@ COMMAND("osd unset "
        "notieragent|nosnaptrim",
        "unset <key>", "osd", "rw")
 COMMAND("osd require-osd-release "\
-       "name=release,type=CephChoices,strings=luminous|mimic|nautilus|octopus "
+       "name=release,type=CephChoices,strings=luminous|mimic|nautilus|octopus|pacific "
         "name=yes_i_really_mean_it,type=CephBool,req=false",
        "set the minimum allowed OSD release to participate in the cluster",
        "osd", "rw")