From d6db84ca7640e5f59a4c16ae4df02ae21623d876 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 19 Jul 2017 22:47:21 -0400 Subject: [PATCH] mon: hide 'osd crush rule list' (we prefer 'ls') Signed-off-by: Sage Weil --- doc/man/8/ceph.rst | 6 ------ doc/release-notes.rst | 1 + src/mon/MonCommands.h | 3 ++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst index 712d862f729..f14c840ecdc 100644 --- a/doc/man/8/ceph.rst +++ b/doc/man/8/ceph.rst @@ -625,12 +625,6 @@ Usage:: ceph osd crush rule dump {} -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 80143f09de0..b6f2225c83c 100644 --- 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 ac50279cc54..b9fc2be0a75 100644 --- 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", \ -- 2.39.5