From: xie xingguo Date: Mon, 10 Jul 2017 00:55:15 +0000 (+0800) Subject: test: fix ut and release-notes X-Git-Tag: v12.1.1~42^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5b99afa73f6ee7af7921f26cd83267ab0b73a46;p=ceph.git 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 --- diff --git a/doc/release-notes.rst b/doc/release-notes.rst index 42970183059..845d35db260 100644 --- 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 - `` will set the class for a particular device. + [...]`` 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 c1aa54b08ae..0c9847d12e8 100755 --- 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