qa/doc: update for "mgr tell" no longer needed

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/doc/mgr/administrator.rst b/doc/mgr/administrator.rst
index d78a30a4d558fde1e1761822142729830a451212..453cd3fbe6d136bfa1215bac69402b11066f8228 100644 (file)
--- a/doc/mgr/administrator.rst
+++ b/doc/mgr/administrator.rst
@@ -55,17 +55,20 @@ daemon as failed using ``ceph mgr fail <mgr name>``.
 Calling module commands
 -----------------------
 
-Where a module implements command line hooks, using the Ceph CLI's
-``tell`` command to call them like this::
+Where a module implements command line hooks, the commands will
+be accessible as ordinary Ceph commands::
 
-    ceph tell mgr <command | help>
+    ceph <command | help>
+
+If you would like to see the list of commands handled by the
+manager (where normal ``ceph help`` would show all mon and mgr commands),
+you can send a command directly to the manager daemon::
+
+    ceph tell mgr help
 
 Note that it is not necessary to address a particular mgr instance,
 simply ``mgr`` will pick the current active daemon.
 
-Use the ``help`` command to get a list of available commands from all
-modules.
-
 Configuration
 -------------
 

diff --git a/qa/suites/rados/rest/mgr-restful.yaml b/qa/suites/rados/rest/mgr-restful.yaml
index f202976e8cf7c0771861fd5124ad54438cf09e4b..e62dd068f11069c3f8f7d46c8866c8c01be7a8a2 100644 (file)
--- a/qa/suites/rados/rest/mgr-restful.yaml
+++ b/qa/suites/rados/rest/mgr-restful.yaml
@@ -8,8 +8,8 @@ tasks:
       - (MGR_DOWN)
 - exec:
     mon.a:
-      - ceph tell mgr.x restful create-key admin
-      - ceph tell mgr.x restful create-self-signed-cert
+      - ceph restful create-key admin
+      - ceph restful create-self-signed-cert
 - ceph.restart: [mgr.x]
 - workunit:
     clients:

diff --git a/src/pybind/mgr/restful/api/__init__.py b/src/pybind/mgr/restful/api/__init__.py
index d4345eebc647f7475ba1a778445dbd3a5e428f62..93c7fdde207df7af10c38bdcdff856466834fa03 100644 (file)
--- a/src/pybind/mgr/restful/api/__init__.py
+++ b/src/pybind/mgr/restful/api/__init__.py
@@ -30,7 +30,7 @@ class Root(RestController):
         return {
             'api_version': 1,
             'auth':
-                'Use "ceph tell mgr restful create_key <key>" to create a key pair, '
+                'Use "ceph restful create_key <key>" to create a key pair, '
                 'pass it as HTTP Basic auth to authenticate',
             'doc': 'See /doc endpoint',
             'info': "Ceph Manager RESTful API server",

diff --git a/src/vstart.sh b/src/vstart.sh
index c59180277a3c831ea81936184c0ae1d3618dc502..68ffff35add7dbb307ab878f51335e3535f5d1d2 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -661,9 +661,9 @@ EOF
         run 'mgr' $CEPH_BIN/ceph-mgr -i $name $ARGS
     done
 
-    if ceph_adm tell mgr restful create-self-signed-cert; then
+    if ceph_adm restful create-self-signed-cert; then
         SF=`mktemp`
-        ceph_adm tell mgr restful create-key admin -o $SF
+        ceph_adm restful create-key admin -o $SF
         RESTFUL_SECRET=`cat $SF`
         rm $SF
     else