From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 01:44:14 +0000 (-0600)
Subject: mgr/cephadm: fix 'orch rm'
X-Git-Tag: v15.1.1~83^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dab438456ff27b4393c6719cc813cd2d6bb72288;p=ceph.git

mgr/cephadm: fix 'orch rm'

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 0887ff7bcd62..68ea674b5d7e 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1815,8 +1815,10 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                     )
         self.log.info('Remove service %s (daemons %s)' % (
             service_name, [a[0] for a in args]))
-        self.spec_store.rm(d.service_name())
-        return self._remove_daemons(args)
+        self.spec_store.rm(service_name)
+        if args:
+            return self._remove_daemons(args)
+        return trivial_result(['Removed service %s' % service_name])
 
     def get_inventory(self, host_filter=None, refresh=False):
         """