From: Sage Weil <sage@redhat.com>
Date: Thu, 5 Mar 2020 03:57:36 +0000 (-0600)
Subject: mgr/cephadm: fix service rm when there are no daemons
X-Git-Tag: v15.1.1~108^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44cc052a88aa0ead3ce906e12e96582c6690ec9c;p=ceph.git

mgr/cephadm: fix service rm when there are no daemons

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 9c0deaa97d6a..fa78ba4bb533 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1797,9 +1797,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                     args.append(
                         (d.name(), d.hostname, True)
                     )
-                    self.spec_store.rm(d.service_name())
         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)
 
     def get_inventory(self, host_filter=None, refresh=False):