mon: hide 'osd crush rule list' (we prefer 'ls')

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

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index 712d862f729234e40d83dc65e98d0974a7fd730e..f14c840ecdcd0001ace91b630a6c9bba26681088 100644 (file)
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -625,12 +625,6 @@ Usage::
 
        ceph osd crush rule dump {<name>}
 
-Subcommand ``list`` lists crush rules.
-
-Usage::
-
-       ceph osd crush rule list
-
 Subcommand ``ls`` lists crush rules.
 
 Usage::

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index 80143f09de0f84efedec33f18bc994b10dd61ad0..b6f2225c83c746ca3e63a84d5179a9f817e34711 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -218,6 +218,7 @@ Major Changes from Kraken
       names, not the values.)
     - ``ceph config-key list`` is deprecated in favor of ``ceph config-key ls``.
     - ``ceph auth list`` is deprecated in favor of ``ceph auth ls``.
+    - ``ceph osd crush rule list`` is deprecated in favor of ``ceph osd crush rule ls``.
     - ``ceph osd set-{full,nearfull,backfillfull}-ratio`` sets the
       cluster-wide ratio for various full thresholds (when the cluster
       refuses IO, when the cluster warns about being close to full,

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index ac50279cc54ffccc0f27c78d4bda0d33d8947238..b9fc2be0a75b5a61d55f36d864dd71a2fbc91119 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -494,7 +494,8 @@ COMMAND("osd lspools " \
 COMMAND("osd blacklist ls", "show blacklisted clients", "osd", "r", "cli,rest")
 COMMAND("osd blacklist clear", "clear all blacklisted clients", "osd", "rw",
         "cli,rest")
-COMMAND("osd crush rule list", "list crush rules", "osd", "r", "cli,rest")
+COMMAND_WITH_FLAG("osd crush rule list", "list crush rules", "osd", "r", "cli,rest",
+                 FLAG(DEPRECATED))
 COMMAND("osd crush rule ls", "list crush rules", "osd", "r", "cli,rest")
 COMMAND("osd crush rule dump " \
        "name=name,type=CephString,goodchars=[A-Za-z0-9-_.],req=false", \