mgr/orchestrator_cli: rename 'mds rm' arg

'name' can be either a group prefix or an instance name, so use a general
variable name.

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

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 8c94a1a2ab7b60ec2943f2c62e9ed8d8eeefdd96..9dec5d7c4c6a801d5204ee7a4cda1a1392458d2b 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -292,10 +292,10 @@ Usage:
         return HandleCommandResult(stdout=completion.result_str())
 
     @_write_cli('orchestrator mds rm',
-                "name=svc_id,type=CephString",
-                'Remove an MDS service')
-    def _mds_rm(self, svc_id):
-        completion = self.remove_mds(svc_id)
+                "name=name,type=CephString",
+                'Remove an MDS service (mds id or fs_name)')
+    def _mds_rm(self, name):
+        completion = self.remove_mds(name)
         self._orchestrator_wait([completion])
         orchestrator.raise_if_exception(completion)
         return HandleCommandResult(stdout=completion.result_str())

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 5ee2c65433308a354051076e6c25776df2e7f355..c4f0bdfd17d497ecceef0d4f8b677713a46c4c9f 100644 (file)
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -784,15 +784,15 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
         })
         return self._create_daemon('mds', mds_id, host, keyring)
 
-    def remove_mds(self, mds_id):
+    def remove_mds(self, name):
         daemons = self._get_services('mds')
         results = []
         for d in daemons:
-            if d.service_instance == mds_id or d.service_instance.startswith(mds_id + '-'):
+            if d.service_instance == name or d.service_instance.startswith(name + '-'):
                 results.append(self._worker_pool.apply_async(
                     self._remove_mds, (d.service_instance, d.nodename)))
         if not results:
-            raise RuntimeError('Unable to find mds.%s[-*] daemon(s)' % mds_id)
+            raise RuntimeError('Unable to find mds.%s[-*] daemon(s)' % name)
         return SSHWriteCompletion(results)
 
     def _remove_mds(self, mds_id, host):