From b28c300258248d169167911866ba39239eb26b63 Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Thu, 29 Jun 2017 18:06:34 -0400
Subject: [PATCH] qa/doc: update for "mgr tell" no longer needed

Signed-off-by: John Spray <john.spray@redhat.com>
---
 doc/mgr/administrator.rst              | 15 +++++++++------
 qa/suites/rados/rest/mgr-restful.yaml  |  4 ++--
 src/pybind/mgr/restful/api/__init__.py |  2 +-
 src/vstart.sh                          |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/doc/mgr/administrator.rst b/doc/mgr/administrator.rst
index d78a30a4d558f..453cd3fbe6d13 100644
--- 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 f202976e8cf7c..e62dd068f1106 100644
--- 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 d4345eebc647f..93c7fdde207df 100644
--- 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 c59180277a3c8..68ffff35add7d 100755
--- 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 
-- 
2.39.5