]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: fix service rm when there are no daemons
authorSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 03:57:36 +0000 (21:57 -0600)
committerSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 03:57:36 +0000 (21:57 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index 9c0deaa97d6afe21388f6df5bf9178e85e1d1fac..fa78ba4bb533a1a429cd911b39adc1fd3c394e36 100644 (file)
@@ -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):