mon: 'config-key list' -> 'config-key ls'

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

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index 339d5c3d192992d5fa59c0d93a4d47b10c38e1f1..7682603ac3429b041c96742b21b2fc8f80229cae 100644 (file)
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -199,7 +199,7 @@ Subcommand ``list`` lists configuration keys.
 
 Usage::
 
-       ceph config-key list
+       ceph config-key ls
 
 Subcommand ``dump`` dumps configuration keys and values.
 

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index 9b40925f6722e5dc9f83ddc5ed7d3483127631fd..cc1f749694fe3461c3351132bea7d75f31f39e5c 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -216,6 +216,7 @@ Major Changes from Kraken
     - ``ceph config-key dump`` dumps config-key entries and their
       contents.  (The existing ``ceph config-key list`` only dumps the key
       names, not the values.)
+    - ``ceph config-key list`` is deprecated in favor of ``ceph config-key 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/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 68126e9430ed8b37de08cc91c80daec372b3b1e0..418a2fae57e8deb33c3b20950fbcfb0049db5b34 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -332,7 +332,7 @@ void Mgr::load_config()
 
   dout(10) << "listing keys" << dendl;
   JSONCommand cmd;
-  cmd.run(monc, "{\"prefix\": \"config-key list\"}");
+  cmd.run(monc, "{\"prefix\": \"config-key ls\"}");
   lock.Unlock();
   cmd.wait();
   lock.Lock();

diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc
index 3adba6dd0d530fa709c7dcf86407de220fdc1c3e..f8e9e1aaf3dc7883370bc16e33a716d2b2099971 100644 (file)
--- a/src/mon/ConfigKeyService.cc
+++ b/src/mon/ConfigKeyService.cc
@@ -241,7 +241,8 @@ bool ConfigKeyService::service_dispatch(MonOpRequestRef op)
       ret = -ENOENT;
     }
 
-  } else if (prefix == "config-key list") {
+  } else if (prefix == "config-key list" ||
+            prefix == "config-key ls") {
     stringstream tmp_ss;
     store_list(tmp_ss);
     rdata.append(tmp_ss);

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index b04b1b7b64d57dcc4fb3b33817d19135ddca3750..5c6e83983f302394b063546f8dd8dc44deb93f8a 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -961,7 +961,9 @@ COMMAND("config-key rm " \
 COMMAND("config-key exists " \
        "name=key,type=CephString", \
        "check for <key>'s existence", "config-key", "r", "cli,rest")
-COMMAND("config-key list ", "list keys", "config-key", "r", "cli,rest")
+COMMAND_WITH_FLAG("config-key list ", "list keys", "config-key", "r", "cli,rest",
+                 FLAG(DEPRECATED))
+COMMAND("config-key ls ", "list keys", "config-key", "r", "cli,rest")
 COMMAND("config-key dump", "dump keys and values", "config-key", "r", "cli,rest")