From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Feb 2017 19:42:16 +0000 (-0600)
Subject: mon/OSDMonitor: rename 'osd pool create' argument field name
X-Git-Tag: v12.1.0~27^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0d42ba02a5650b6bcbbe9d439c0abd9977b1775;p=ceph.git

mon/OSDMonitor: rename 'osd pool create' argument field name

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

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 0216d73b4de2..9b89ebdfa244 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -828,7 +828,7 @@ COMMAND("osd pool create " \
 	"name=pgp_num,type=CephInt,range=0,req=false " \
         "name=pool_type,type=CephChoices,strings=replicated|erasure,req=false " \
 	"name=erasure_code_profile,type=CephString,req=false,goodchars=[A-Za-z0-9-_.] " \
-	"name=ruleset,type=CephString,req=false " \
+	"name=rule,type=CephString,req=false " \
         "name=expected_num_objects,type=CephInt,req=false", \
 	"create pool", "osd", "rw", "cli,rest")
 COMMAND("osd pool delete " \
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index b1e57d19cec6..982f85fd713f 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -9521,7 +9521,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
 
     bool implicit_ruleset_creation = false;
     string ruleset_name;
-    cmd_getval(g_ceph_context, cmdmap, "ruleset", ruleset_name);
+    cmd_getval(g_ceph_context, cmdmap, "rule", ruleset_name);
     string erasure_code_profile;
     cmd_getval(g_ceph_context, cmdmap, "erasure_code_profile", erasure_code_profile);