From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 17:38:13 +0000 (-0600)
Subject: mgr/cephadm: force remove daemons when removing service
X-Git-Tag: v15.1.1~115^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5be23f3a12a6a23d16fad828517331d33a03710;p=ceph.git

mgr/cephadm: force remove daemons when removing service

The rm CLI checks for --force based on type, so it isn't passed down
through the implementations.  So, pass it through.

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 9597d84348890..deb735b2d3031 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1788,13 +1788,13 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         self.log.info('Remove daemons %s' % [a[0] for a in args])
         return self._remove_daemons(args)
 
-    def remove_service(self, service_name, force=False):
+    def remove_service(self, service_name):
         args = []
         for host, dm in self.cache.daemons.items():
             for name, d in dm.items():
                 if d.matches_service(service_name):
                     args.append(
-                        (d.name(), d.hostname, force)
+                        (d.name(), d.hostname, True)
                     )
                     self.spec_store.rm(d.service_name())
         self.log.info('Remove service %s (daemons %s)' % (