From: Sage Weil <sage@newdream.net>
Date: Wed, 7 Jul 2021 14:32:11 +0000 (-0400)
Subject: qa: scrub a few remaining mentions of ruleset
X-Git-Tag: v17.1.0~1398^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=14f85370a849d312c98e29e07c2dcc6490b7ee71;p=ceph-ci.git

qa: scrub a few remaining mentions of ruleset

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/tasks/ceph.conf.template b/qa/tasks/ceph.conf.template
index 609a124b82d..e2e1f59a861 100644
--- a/qa/tasks/ceph.conf.template
+++ b/qa/tasks/ceph.conf.template
@@ -32,7 +32,7 @@
         mon_warn_on_pool_no_redundancy = false
 	mon_allow_pool_size_one = true
 
-        osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd crush-failure-domain=osd"
+        osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 crush-failure-domain=osd"
 
 	osd default data pool replay window = 5
 
diff --git a/qa/tasks/cephadm.conf b/qa/tasks/cephadm.conf
index 0a9ae14e100..6f84866d0a9 100644
--- a/qa/tasks/cephadm.conf
+++ b/qa/tasks/cephadm.conf
@@ -10,7 +10,7 @@ mon clock drift allowed = 1.000
 # replicate across OSDs, not hosts
 osd crush chooseleaf type = 0
 #osd pool default size = 2
-osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd crush-failure-domain=osd"
+osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 crush-failure-domain=osd"
 
 # enable some debugging
 auth debug = true
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 3c79ea634ca..9937fb1db8b 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -2465,7 +2465,7 @@ function test_mon_osd_erasure_code()
   ceph osd erasure-code-profile set fooprofile a=b c=d e=f --force
   ceph osd erasure-code-profile set fooprofile a=b c=d e=f
   expect_false ceph osd erasure-code-profile set fooprofile a=b c=d e=f g=h
-  # make sure ruleset-foo doesn't work anymore
+  # make sure rule-foo doesn't work anymore
   expect_false ceph osd erasure-code-profile set barprofile ruleset-failure-domain=host
   ceph osd erasure-code-profile set barprofile crush-failure-domain=host
   # clean up
diff --git a/qa/workunits/mon/pool_ops.sh b/qa/workunits/mon/pool_ops.sh
index 6baae495ddd..90b224902bb 100755
--- a/qa/workunits/mon/pool_ops.sh
+++ b/qa/workunits/mon/pool_ops.sh
@@ -46,7 +46,7 @@ function expect_config_value()
 # note: we need to pass the other args or ceph_argparse.py will take
 # 'invalid' that is not replicated|erasure and assume it is the next
 # argument, which is a string.
-expect_false ceph osd pool create foo 123 123 invalid foo-profile foo-ruleset
+expect_false ceph osd pool create foo 123 123 invalid foo-profile foo-rule
 
 ceph osd pool create foo 123 123 replicated
 ceph osd pool create fooo 123 123 erasure default