mgr/orchestrator: pass 'force' flag down for remove_service

Signed-off-by: Sage Weil <[email protected]>

src/pybind/mgr/cephadm/module.py

@@ -1917,7 +1917,7 @@ def remove_daemons(self, names):
         return self._remove_daemons(args)
 
     @handle_orch_error
-    def remove_service(self, service_name: str) -> str:
+    def remove_service(self, service_name: str, force: bool = False) -> str:
         self.log.info('Remove service %s' % service_name)
         self._trigger_preview_refresh(service_name=service_name)
         if service_name in self.spec_store:

src/pybind/mgr/orchestrator/_interface.py

@@ -490,7 +490,7 @@ def remove_daemons(self, names: List[str]) -> OrchResult[List[str]]:
         """
         raise NotImplementedError()
 
-    def remove_service(self, service_name: str) -> OrchResult[str]:
+    def remove_service(self, service_name: str, force: bool = False) -> OrchResult[str]:
         """
         Remove a service (a collection of daemons).
 

src/pybind/mgr/orchestrator/module.py

@@ -1019,7 +1019,7 @@ def _service_rm(self,
         """Remove a service"""
         if service_name in ['mon', 'mgr'] and not force:
             raise OrchestratorError('The mon and mgr services cannot be removed')
-        completion = self.remove_service(service_name)
+        completion = self.remove_service(service_name, force=force)
         raise_if_exception(completion)
         return HandleCommandResult(stdout=completion.result_str())
 

src/pybind/mgr/rook/module.py

@@ -463,7 +463,7 @@ def _get_pool_params(self) -> Tuple[int, str]:
         return num_replicas, leaf_type
 
     @handle_orch_error
-    def remove_service(self, service_name: str) -> str:
+    def remove_service(self, service_name: str, force: bool = False) -> str:
         if service_name == 'rbd-mirror':
             return self.rook_cluster.rm_service('cephrbdmirrors', 'default-rbd-mirror')
         service_type, service_name = service_name.split('.', 1)

src/pybind/mgr/test_orchestrator/module.py

@@ -227,7 +227,7 @@ def remove_daemons(self, names):
         return 'done'
 
     @handle_orch_error
-    def remove_service(self, service_name):
+    def remove_service(self, service_name, force = False):
         assert isinstance(service_name, str)
         return 'done'