test: fix ut and release-notes

To keep pace with the newly merged https://github.com/ceph/ceph/pull/16027

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index 429701830593fa3dc763af5f0e4680747da527dc..845d35db260c4d1d8d4639ed468b5bf3fb608261 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -226,7 +226,7 @@ Major Changes from Kraken
       ``ceph osd reweight`` commands.
     - ``ceph osd crush class {create,rm,ls,rename}`` manage the new
       CRUSH *device class* feature.  ``ceph crush set-device-class
-      <osd> <class>`` will set the class for a particular device.
+      <class> <osd> [<osd>...]`` will set the class for particular devices.
     - ``ceph osd crush rule create-replicated`` replaces the old
       ``ceph osd crush rule create-simple`` command to create a CRUSH
       rule for a replicated pool.  Notably it takes a `class` argument

diff --git a/qa/workunits/mon/crush_ops.sh b/qa/workunits/mon/crush_ops.sh
index c1aa54b08ae449f2a02e1f348af9d1ef8ad9487b..0c9847d12e80edd73b7f23141b1cbe8e40bd58bb 100755 (executable)
--- a/qa/workunits/mon/crush_ops.sh
+++ b/qa/workunits/mon/crush_ops.sh
@@ -23,8 +23,8 @@ ceph osd crush rule create-simple bar default host
 ceph osd require-osd-release luminous
 ceph osd crush class create ssd
 ceph osd crush class create hdd
-ceph osd crush set-device-class osd.0 ssd
-ceph osd crush set-device-class osd.1 hdd
+ceph osd crush set-device-class ssd osd.0
+ceph osd crush set-device-class hdd osd.1
 ceph osd crush rule create-replicated foo-ssd default host ssd
 ceph osd crush rule create-replicated foo-hdd default host hdd