osd: replicated_ruleset -> replicated_rule

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

diff --git a/qa/workunits/mon/crush_ops.sh b/qa/workunits/mon/crush_ops.sh
index 80c58ca752264395de8ab53c2ffa5e6e3b99b8e4..11891480a9053a24fbb29edb0450dbb8bff08b8e 100755 (executable)
--- a/qa/workunits/mon/crush_ops.sh
+++ b/qa/workunits/mon/crush_ops.sh
@@ -26,7 +26,7 @@ ceph osd crush rule rm foo  # idempotent
 ceph osd crush rule rm bar
 
 # can't delete in-use rules, tho:
-expect_false ceph osd crush rule rm replicated_ruleset
+expect_false ceph osd crush rule rm replicated_rule
 
 # build a simple map
 expect_false ceph osd crush add-bucket foo osd

diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index 919b811130a8f1f1bf875c9b67bff59a39e56c49..565873e518297ba9d4546a9b4c20f9f0168d8578 100755 (executable)
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -419,6 +419,6 @@ if __name__ == '__main__':
     assert(r.myjson['output']['size'] == 2)
 
     r = expect('osd/pool/get.json?pool=rbd&var=crush_rule', 'GET', 200, 'json')
-    assert(r.myjson['output']['crush_rule'] == 0)
+    assert(r.myjson['output']['crush_rule'] == "replicated_rule")
 
     print('OK')

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 2d88f91d4bcc1d9f0ec59732961c202ab21196a2..594ff82fae28dd10584bd798ad1d569d77cd6972 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -3467,7 +3467,7 @@ int OSDMap::build_simple_crush_rules(
 
   int r;
   r = crush.add_simple_rule_at(
-    "replicated_ruleset", root, failure_domain,
+    "replicated_rule", root, failure_domain,
     "firstn", pg_pool_t::TYPE_REPLICATED,
     crush_rule, ss);
   if (r < 0)

diff --git a/src/test/cli/crushtool/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t
index 3b4baf7fb749f1cbcae87f86dd4cd0865ce81532..bf9ab0c4dd20476780f5f7eb6f7c1715a1ab946c 100644 (file)
--- a/src/test/cli/crushtool/arg-order-checks.t
+++ b/src/test/cli/crushtool/arg-order-checks.t
@@ -189,7 +189,7 @@
   }
   
   # rules
-  rule replicated_ruleset {
+  rule replicated_rule {
   \truleset 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
@@ -202,8 +202,8 @@
   # end crush map
 # tunables before reweight
   $ crushtool -i "$map" --set-straw-calc-version 0 --reweight --test --show-utilization --max-x 100 --min-x 1
-  rule 0 (replicated_ruleset), x = 1..100, numrep = 1..10
-  rule 0 (replicated_ruleset) num_rep 1 result size == 1:\t100/100 (esc)
+  rule 0 (replicated_rule), x = 1..100, numrep = 1..10
+  rule 0 (replicated_rule) num_rep 1 result size == 1:\t100/100 (esc)
     device 0:\t\t stored : 4\t expected : 4 (esc)
     device 1:\t\t stored : 4\t expected : 4 (esc)
     device 2:\t\t stored : 40\t expected : 4 (esc)
@@ -225,7 +225,7 @@
     device 22:\t\t stored : 2\t expected : 4 (esc)
     device 23:\t\t stored : 2\t expected : 4 (esc)
     device 24:\t\t stored : 2\t expected : 4 (esc)
-  rule 0 (replicated_ruleset) num_rep 2 result size == 2:\t100/100 (esc)
+  rule 0 (replicated_rule) num_rep 2 result size == 2:\t100/100 (esc)
     device 0:\t\t stored : 6\t expected : 8 (esc)
     device 1:\t\t stored : 6\t expected : 8 (esc)
     device 2:\t\t stored : 60\t expected : 8 (esc)
@@ -251,7 +251,7 @@
     device 22:\t\t stored : 4\t expected : 8 (esc)
     device 23:\t\t stored : 5\t expected : 8 (esc)
     device 24:\t\t stored : 6\t expected : 8 (esc)
-  rule 0 (replicated_ruleset) num_rep 3 result size == 3:\t100/100 (esc)
+  rule 0 (replicated_rule) num_rep 3 result size == 3:\t100/100 (esc)
     device 0:\t\t stored : 8\t expected : 12 (esc)
     device 1:\t\t stored : 6\t expected : 12 (esc)
     device 2:\t\t stored : 69\t expected : 12 (esc)
@@ -277,7 +277,7 @@
     device 22:\t\t stored : 15\t expected : 12 (esc)
     device 23:\t\t stored : 8\t expected : 12 (esc)
     device 24:\t\t stored : 11\t expected : 12 (esc)
-  rule 0 (replicated_ruleset) num_rep 4 result size == 4:\t100/100 (esc)
+  rule 0 (replicated_rule) num_rep 4 result size == 4:\t100/100 (esc)
     device 0:\t\t stored : 8\t expected : 16 (esc)
     device 1:\t\t stored : 6\t expected : 16 (esc)
     device 2:\t\t stored : 72\t expected : 16 (esc)
@@ -303,8 +303,8 @@
     device 22:\t\t stored : 20\t expected : 16 (esc)
     device 23:\t\t stored : 10\t expected : 16 (esc)
     device 24:\t\t stored : 15\t expected : 16 (esc)
-  rule 0 (replicated_ruleset) num_rep 5 result size == 4:\t3/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 5 result size == 5:\t97/100 (esc)
+  rule 0 (replicated_rule) num_rep 5 result size == 4:\t3/100 (esc)
+  rule 0 (replicated_rule) num_rep 5 result size == 5:\t97/100 (esc)
     device 0:\t\t stored : 8\t expected : 20 (esc)
     device 1:\t\t stored : 6\t expected : 20 (esc)
     device 2:\t\t stored : 74\t expected : 20 (esc)
@@ -330,8 +330,8 @@
     device 22:\t\t stored : 25\t expected : 20 (esc)
     device 23:\t\t stored : 13\t expected : 20 (esc)
     device 24:\t\t stored : 18\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 6 result size == 4:\t3/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 6 result size == 5:\t97/100 (esc)
+  rule 0 (replicated_rule) num_rep 6 result size == 4:\t3/100 (esc)
+  rule 0 (replicated_rule) num_rep 6 result size == 5:\t97/100 (esc)
     device 0:\t\t stored : 8\t expected : 20 (esc)
     device 1:\t\t stored : 6\t expected : 20 (esc)
     device 2:\t\t stored : 74\t expected : 20 (esc)
@@ -357,8 +357,8 @@
     device 22:\t\t stored : 25\t expected : 20 (esc)
     device 23:\t\t stored : 13\t expected : 20 (esc)
     device 24:\t\t stored : 18\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 7 result size == 4:\t3/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 7 result size == 5:\t97/100 (esc)
+  rule 0 (replicated_rule) num_rep 7 result size == 4:\t3/100 (esc)
+  rule 0 (replicated_rule) num_rep 7 result size == 5:\t97/100 (esc)
     device 0:\t\t stored : 8\t expected : 20 (esc)
     device 1:\t\t stored : 6\t expected : 20 (esc)
     device 2:\t\t stored : 74\t expected : 20 (esc)
@@ -384,8 +384,8 @@
     device 22:\t\t stored : 25\t expected : 20 (esc)
     device 23:\t\t stored : 13\t expected : 20 (esc)
     device 24:\t\t stored : 18\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 8 result size == 4:\t3/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 8 result size == 5:\t97/100 (esc)
+  rule 0 (replicated_rule) num_rep 8 result size == 4:\t3/100 (esc)
+  rule 0 (replicated_rule) num_rep 8 result size == 5:\t97/100 (esc)
     device 0:\t\t stored : 8\t expected : 20 (esc)
     device 1:\t\t stored : 6\t expected : 20 (esc)
     device 2:\t\t stored : 74\t expected : 20 (esc)
@@ -411,8 +411,8 @@
     device 22:\t\t stored : 25\t expected : 20 (esc)
     device 23:\t\t stored : 13\t expected : 20 (esc)
     device 24:\t\t stored : 18\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 9 result size == 4:\t2/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 9 result size == 5:\t98/100 (esc)
+  rule 0 (replicated_rule) num_rep 9 result size == 4:\t2/100 (esc)
+  rule 0 (replicated_rule) num_rep 9 result size == 5:\t98/100 (esc)
     device 0:\t\t stored : 8\t expected : 20 (esc)
     device 1:\t\t stored : 6\t expected : 20 (esc)
     device 2:\t\t stored : 74\t expected : 20 (esc)
@@ -438,8 +438,8 @@
     device 22:\t\t stored : 25\t expected : 20 (esc)
     device 23:\t\t stored : 13\t expected : 20 (esc)
     device 24:\t\t stored : 18\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 10 result size == 4:\t2/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 10 result size == 5:\t98/100 (esc)
+  rule 0 (replicated_rule) num_rep 10 result size == 4:\t2/100 (esc)
+  rule 0 (replicated_rule) num_rep 10 result size == 5:\t98/100 (esc)
     device 0:\t\t stored : 8\t expected : 20 (esc)
     device 1:\t\t stored : 6\t expected : 20 (esc)
     device 2:\t\t stored : 74\t expected : 20 (esc)
@@ -467,8 +467,8 @@
     device 24:\t\t stored : 18\t expected : 20 (esc)
   crushtool successfully built or modified map.  Use '-o <file>' to write it out.
   $ crushtool -i "$map" --set-straw-calc-version 1 --reweight --test --show-utilization --max-x 100 --min-x 1
-  rule 0 (replicated_ruleset), x = 1..100, numrep = 1..10
-  rule 0 (replicated_ruleset) num_rep 1 result size == 1:\t100/100 (esc)
+  rule 0 (replicated_rule), x = 1..100, numrep = 1..10
+  rule 0 (replicated_rule) num_rep 1 result size == 1:\t100/100 (esc)
     device 1:\t\t stored : 1\t expected : 4 (esc)
     device 2:\t\t stored : 75\t expected : 4 (esc)
     device 3:\t\t stored : 2\t expected : 4 (esc)
@@ -483,7 +483,7 @@
     device 20:\t\t stored : 2\t expected : 4 (esc)
     device 22:\t\t stored : 1\t expected : 4 (esc)
     device 23:\t\t stored : 1\t expected : 4 (esc)
-  rule 0 (replicated_ruleset) num_rep 2 result size == 2:\t100/100 (esc)
+  rule 0 (replicated_rule) num_rep 2 result size == 2:\t100/100 (esc)
     device 0:\t\t stored : 1\t expected : 8 (esc)
     device 1:\t\t stored : 1\t expected : 8 (esc)
     device 2:\t\t stored : 95\t expected : 8 (esc)
@@ -508,7 +508,7 @@
     device 22:\t\t stored : 6\t expected : 8 (esc)
     device 23:\t\t stored : 5\t expected : 8 (esc)
     device 24:\t\t stored : 8\t expected : 8 (esc)
-  rule 0 (replicated_ruleset) num_rep 3 result size == 3:\t100/100 (esc)
+  rule 0 (replicated_rule) num_rep 3 result size == 3:\t100/100 (esc)
     device 0:\t\t stored : 1\t expected : 12 (esc)
     device 1:\t\t stored : 1\t expected : 12 (esc)
     device 2:\t\t stored : 95\t expected : 12 (esc)
@@ -534,8 +534,8 @@
     device 22:\t\t stored : 11\t expected : 12 (esc)
     device 23:\t\t stored : 11\t expected : 12 (esc)
     device 24:\t\t stored : 11\t expected : 12 (esc)
-  rule 0 (replicated_ruleset) num_rep 4 result size == 3:\t3/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 4 result size == 4:\t97/100 (esc)
+  rule 0 (replicated_rule) num_rep 4 result size == 3:\t3/100 (esc)
+  rule 0 (replicated_rule) num_rep 4 result size == 4:\t97/100 (esc)
     device 0:\t\t stored : 1\t expected : 16 (esc)
     device 1:\t\t stored : 1\t expected : 16 (esc)
     device 2:\t\t stored : 95\t expected : 16 (esc)
@@ -561,9 +561,9 @@
     device 22:\t\t stored : 14\t expected : 16 (esc)
     device 23:\t\t stored : 13\t expected : 16 (esc)
     device 24:\t\t stored : 14\t expected : 16 (esc)
-  rule 0 (replicated_ruleset) num_rep 5 result size == 3:\t3/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 5 result size == 4:\t43/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 5 result size == 5:\t54/100 (esc)
+  rule 0 (replicated_rule) num_rep 5 result size == 3:\t3/100 (esc)
+  rule 0 (replicated_rule) num_rep 5 result size == 4:\t43/100 (esc)
+  rule 0 (replicated_rule) num_rep 5 result size == 5:\t54/100 (esc)
     device 0:\t\t stored : 1\t expected : 20 (esc)
     device 1:\t\t stored : 1\t expected : 20 (esc)
     device 2:\t\t stored : 95\t expected : 20 (esc)
@@ -589,9 +589,9 @@
     device 22:\t\t stored : 16\t expected : 20 (esc)
     device 23:\t\t stored : 15\t expected : 20 (esc)
     device 24:\t\t stored : 16\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 6 result size == 3:\t2/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 6 result size == 4:\t43/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 6 result size == 5:\t55/100 (esc)
+  rule 0 (replicated_rule) num_rep 6 result size == 3:\t2/100 (esc)
+  rule 0 (replicated_rule) num_rep 6 result size == 4:\t43/100 (esc)
+  rule 0 (replicated_rule) num_rep 6 result size == 5:\t55/100 (esc)
     device 0:\t\t stored : 1\t expected : 20 (esc)
     device 1:\t\t stored : 1\t expected : 20 (esc)
     device 2:\t\t stored : 95\t expected : 20 (esc)
@@ -617,9 +617,9 @@
     device 22:\t\t stored : 16\t expected : 20 (esc)
     device 23:\t\t stored : 16\t expected : 20 (esc)
     device 24:\t\t stored : 16\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 7 result size == 3:\t2/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 7 result size == 4:\t42/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 7 result size == 5:\t56/100 (esc)
+  rule 0 (replicated_rule) num_rep 7 result size == 3:\t2/100 (esc)
+  rule 0 (replicated_rule) num_rep 7 result size == 4:\t42/100 (esc)
+  rule 0 (replicated_rule) num_rep 7 result size == 5:\t56/100 (esc)
     device 0:\t\t stored : 1\t expected : 20 (esc)
     device 1:\t\t stored : 1\t expected : 20 (esc)
     device 2:\t\t stored : 95\t expected : 20 (esc)
@@ -645,9 +645,9 @@
     device 22:\t\t stored : 16\t expected : 20 (esc)
     device 23:\t\t stored : 16\t expected : 20 (esc)
     device 24:\t\t stored : 16\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 8 result size == 3:\t2/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 8 result size == 4:\t40/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 8 result size == 5:\t58/100 (esc)
+  rule 0 (replicated_rule) num_rep 8 result size == 3:\t2/100 (esc)
+  rule 0 (replicated_rule) num_rep 8 result size == 4:\t40/100 (esc)
+  rule 0 (replicated_rule) num_rep 8 result size == 5:\t58/100 (esc)
     device 0:\t\t stored : 1\t expected : 20 (esc)
     device 1:\t\t stored : 1\t expected : 20 (esc)
     device 2:\t\t stored : 95\t expected : 20 (esc)
@@ -673,9 +673,9 @@
     device 22:\t\t stored : 16\t expected : 20 (esc)
     device 23:\t\t stored : 16\t expected : 20 (esc)
     device 24:\t\t stored : 16\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 9 result size == 3:\t2/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 9 result size == 4:\t37/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 9 result size == 5:\t61/100 (esc)
+  rule 0 (replicated_rule) num_rep 9 result size == 3:\t2/100 (esc)
+  rule 0 (replicated_rule) num_rep 9 result size == 4:\t37/100 (esc)
+  rule 0 (replicated_rule) num_rep 9 result size == 5:\t61/100 (esc)
     device 0:\t\t stored : 1\t expected : 20 (esc)
     device 1:\t\t stored : 1\t expected : 20 (esc)
     device 2:\t\t stored : 95\t expected : 20 (esc)
@@ -701,9 +701,9 @@
     device 22:\t\t stored : 16\t expected : 20 (esc)
     device 23:\t\t stored : 16\t expected : 20 (esc)
     device 24:\t\t stored : 16\t expected : 20 (esc)
-  rule 0 (replicated_ruleset) num_rep 10 result size == 3:\t2/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 10 result size == 4:\t36/100 (esc)
-  rule 0 (replicated_ruleset) num_rep 10 result size == 5:\t62/100 (esc)
+  rule 0 (replicated_rule) num_rep 10 result size == 3:\t2/100 (esc)
+  rule 0 (replicated_rule) num_rep 10 result size == 4:\t36/100 (esc)
+  rule 0 (replicated_rule) num_rep 10 result size == 5:\t62/100 (esc)
     device 0:\t\t stored : 1\t expected : 20 (esc)
     device 1:\t\t stored : 1\t expected : 20 (esc)
     device 2:\t\t stored : 95\t expected : 20 (esc)

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index a941307f0053af60519bf171de3e8a5505b89d1c..bebfd7fdcb7ed18191fab06d34eb424dd92b5e68 100644 (file)
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -51,7 +51,7 @@
   }
   
   # rules
-  rule replicated_ruleset {
+  rule replicated_rule {
   \truleset 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)

diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t
index 4d0007b0f86d1014e8c179ae9290d34532e1ef7c..3fc5fe00b2c4bafaa612d300962e50db9ffb07fa 100644 (file)
--- a/src/test/cli/osdmaptool/create-print.t
+++ b/src/test/cli/osdmaptool/create-print.t
@@ -60,7 +60,7 @@
   }
   
   # rules
-  rule replicated_ruleset {
+  rule replicated_rule {
   \truleset 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)

diff --git a/src/test/cli/osdmaptool/create-racks.t b/src/test/cli/osdmaptool/create-racks.t
index cae0ed28f00d7ac3a4ec48256df3062d8395b9ea..567a1680f97a60d19d0a0f73adc86b400dd9e2f5 100644 (file)
--- a/src/test/cli/osdmaptool/create-racks.t
+++ b/src/test/cli/osdmaptool/create-racks.t
@@ -768,7 +768,7 @@
   }
   
   # rules
-  rule replicated_ruleset {
+  rule replicated_rule {
   \truleset 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)

diff --git a/src/test/cli/osdmaptool/crush.t b/src/test/cli/osdmaptool/crush.t
index d2f27ef736d3b17a836148bb825d79a84aa62757..8e77c7a9a9867eb318828f54b735307abb0027cb 100644 (file)
--- a/src/test/cli/osdmaptool/crush.t
+++ b/src/test/cli/osdmaptool/crush.t
@@ -6,5 +6,5 @@
   osdmaptool: exported crush map to oc
   $ osdmaptool --import-crush oc myosdmap
   osdmaptool: osdmap file 'myosdmap'
-  osdmaptool: imported 492 byte crush map from oc
+  osdmaptool: imported 489 byte crush map from oc
   osdmaptool: writing epoch 3 to myosdmap

diff --git a/src/test/crush/crush-choose-args-expected-one-more-0.txt b/src/test/crush/crush-choose-args-expected-one-more-0.txt
index c82edaf7808011201c6a31c1f3894fc70649656b..0d61ec1193d86df9f349eb93defaf837aef94faf 100644 (file)
--- a/src/test/crush/crush-choose-args-expected-one-more-0.txt
+++ b/src/test/crush/crush-choose-args-expected-one-more-0.txt
@@ -43,7 +43,7 @@ root default {
 }
 
 # rules
-rule replicated_ruleset {
+rule replicated_rule {
        ruleset 0
        type replicated
        min_size 1

diff --git a/src/test/crush/crush-choose-args-expected-one-more-3.txt b/src/test/crush/crush-choose-args-expected-one-more-3.txt
index cc7b2fc4875f2fd2d76f69be61f944bf0422575a..8031143d8595a3469ca0a4e5a7a8df6fe0029c86 100644 (file)
--- a/src/test/crush/crush-choose-args-expected-one-more-3.txt
+++ b/src/test/crush/crush-choose-args-expected-one-more-3.txt
@@ -43,7 +43,7 @@ root default {
 }
 
 # rules
-rule replicated_ruleset {
+rule replicated_rule {
        ruleset 0
        type replicated
        min_size 1

diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh
index f4ba7de99d95fee14efc7ee340d9c490c87132c5..ac704e0f5b950c9b66b93a9ccd3ce7194b975633 100755 (executable)
--- a/src/test/mon/osd-crush.sh
+++ b/src/test/mon/osd-crush.sh
@@ -40,7 +40,7 @@ function TEST_crush_rule_create_simple() {
 
     run_mon $dir a || return 1
 
-    ceph --format xml osd crush rule dump replicated_ruleset | \
+    ceph --format xml osd crush rule dump replicated_rule | \
         egrep '<op>take</op><item>[^<]+</item><item_name>default</item_name>' | \
         grep '<op>choose_firstn</op><num>0</num><type>osd</type>' || return 1
     local ruleset=ruleset0

diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index b879d9de0bec99b136649b10fff4ad328602be72..53733abf80430ea8be5400a152b5075d2e5fbd62 100755 (executable)
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -174,9 +174,9 @@ function TEST_erasure_code_pool_lrc() {
 function TEST_replicated_pool() {
     local dir=$1
     run_mon $dir a || return 1
-    ceph osd pool create replicated 12 12 replicated replicated_ruleset 2>&1 | \
+    ceph osd pool create replicated 12 12 replicated replicated_rule 2>&1 | \
         grep "pool 'replicated' created" || return 1
-    ceph osd pool create replicated 12 12 replicated replicated_ruleset 2>&1 | \
+    ceph osd pool create replicated 12 12 replicated replicated_rule 2>&1 | \
         grep 'already exists' || return 1
     # default is replicated
     ceph osd pool create replicated1 12 12 2>&1 | \