From: Sage Weil Date: Tue, 31 Mar 2020 21:37:44 +0000 (-0500) Subject: mon/MonCommands: require-osd-release pacific X-Git-Tag: v16.1.0~2624^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc99c3bc24f33406b36e4d12721f5daf7f2fefbe;p=ceph.git mon/MonCommands: require-osd-release pacific Signed-off-by: Sage Weil --- diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index dbf9612fa8f7..0a1ce18640ad 100644 --- 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 d1cbd336e8f5..bc84a0bee92b 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -794,7 +794,7 @@ COMMAND("osd unset " "notieragent|nosnaptrim", "unset ", "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")