From f5be23f3a12a6a23d16fad828517331d33a03710 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 4 Mar 2020 11:38:13 -0600 Subject: [PATCH] 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 --- src/pybind/mgr/cephadm/module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 9597d843488..deb735b2d30 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)' % ( -- 2.39.5