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 9597d84348890abd7cd4d8587a5ef9ab3d8f202a..deb735b2d3031867b3f111f03e64ce5365b4fc18 100644 (file)
--- 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)' % (