qa/workunits/cephtool/test.sh: fix require-osd-release test

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

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index df66f4708c17be4e59b487137e9cf309fb54596b..db5ea28a5a4d95c863f0adf3ff2339bec066c115 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -68,6 +68,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] qa/workunits/cephtool/test.sh: adjust `require-osd-release` test
 
 
 Code cleanup

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 16d8fa551e4804c01bd61be198cd858b28f49c05..79533aff13dfbc3695680a62cc6505f385d0892f 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1479,8 +1479,9 @@ function test_mon_osd()
        expect_false ceph osd set $f
        expect_false ceph osd unset $f
   done
-  ceph osd require-osd-release octopus
+  ceph osd require-osd-release pacific
   # can't lower
+  expect_false ceph osd require-osd-release octopus
   expect_false ceph osd require-osd-release nautilus
   expect_false ceph osd require-osd-release mimic
   expect_false ceph osd require-osd-release luminous