From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 13:22:08 +0000 (-0600)
Subject: mgr/cephadm: do not error out on service rm|action if no daemons
X-Git-Tag: v15.1.1~115^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35a043caec2f770a209e5870a12b950428f03701;p=ceph.git

mgr/cephadm: do not error out on service rm|action if 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 1c6ed178cae9..9597d8434889 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1732,9 +1732,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 if d.matches_service(service_name):
                     args.append((d.daemon_type, d.daemon_id,
                                  d.hostname, action))
-        if not args:
-            raise orchestrator.OrchestratorError(
-                'Unable to find %s.%s.* daemon(s)' % (service_name))
         self.log.info('%s service %s' % (action, service_name))
         return self._daemon_actions(args)
 
@@ -1800,9 +1797,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                         (d.name(), d.hostname, force)
                     )
                     self.spec_store.rm(d.service_name())
-        if not args:
-            raise OrchestratorError('Unable to find daemons in %s service' % (
-                service_name))
         self.log.info('Remove service %s (daemons %s)' % (
             service_name, [a[0] for a in args]))
         return self._remove_daemons(args)