mgr/orchestrator: drop 'reload' service[-instance] action

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index f0f8ea95c32ec0fe2f23f1d64c59fe91b2eafb02..964bb45b539a6e108d6fa30736df1d954f172029 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -833,8 +833,6 @@ class CephadmOrchestrator(MgrModule, orchestrator.Orchestrator):
                        service_id=None):
         self.log.debug('service_action action %s type %s name %s id %s' % (
             action, service_type, service_name, service_id))
-        if action == 'reload':
-            return trivial_result(["Reload is a no-op"])
 
         def _proc_daemons(daemons):
             if service_name is None and service_id is None:

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index c411dabcb5e9b2545ff67be3b071900694cee43b..2c11f6840fea4afafb6a4b4eb1975fc0ed32459f 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -857,7 +857,7 @@ class Orchestrator(object):
         * If using service_id, perform the action on a single specific daemon
           instance.
 
-        :param action: one of "start", "stop", "reload", "restart", "redeploy"
+        :param action: one of "start", "stop", "restart", "redeploy"
         :param service_type: e.g. "mds", "rgw", ...
         :param service_name: name of logical service ("cephfs", "us-east", ...)
         :param service_id: service daemon instance (usually a short hostname)

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index fb8f05813e7f40b9cf756a8def5e10a6c48a81e2..75a9a31c0b027022a5491ee718e3e97ed6ae2d63 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -575,10 +575,10 @@ Usage:
 
     @orchestrator._cli_write_command(
         'orchestrator service',
-        "name=action,type=CephChoices,strings=start|stop|reload|restart|redeploy "
+        "name=action,type=CephChoices,strings=start|stop|restart|redeploy "
         "name=svc_type,type=CephString "
         "name=svc_name,type=CephString",
-        'Start, stop or reload an entire service (i.e. all daemons)')
+        'Start, stop, restart, redeploy an entire service (i.e. all daemons)')
     def _service_action(self, action, svc_type, svc_name):
         completion = self.service_action(action, svc_type, service_name=svc_name)
         self._orchestrator_wait([completion])
@@ -587,10 +587,10 @@ Usage:
 
     @orchestrator._cli_write_command(
         'orchestrator service-instance',
-        "name=action,type=CephChoices,strings=start|stop|reload|restart|redeploy "
+        "name=action,type=CephChoices,strings=start|stop|restart|redeploy "
         "name=svc_type,type=CephString "
         "name=svc_id,type=CephString",
-        'Start, stop or reload a specific service instance')
+        'Start, stop, restart, or redeploy a specific service instance')
     def _service_instance_action(self, action, svc_type, svc_id):
         completion = self.service_action(action, svc_type, service_id=svc_id)
         self._orchestrator_wait([completion])