From b6f42a06617a9a9f3ea7961c256a1033e05eecd2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 11 Feb 2020 14:47:11 -0600 Subject: [PATCH] mgr/rook: move to remove_service() Signed-off-by: Sage Weil --- src/pybind/mgr/rook/module.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py index eb7e23f8085..c9f8c70dae5 100644 --- a/src/pybind/mgr/rook/module.py +++ b/src/pybind/mgr/rook/module.py @@ -325,20 +325,20 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator): mgr=self ) - def remove_mds(self, name): - return self._service_rm_decorate( - 'MDS', name, lambda: self.rook_cluster.rm_service('cephfilesystems', name) - ) - - def remove_rgw(self, zone): - return self._service_rm_decorate( - 'RGW', zone, lambda: self.rook_cluster.rm_service('cephobjectstores', zone) - ) - - def remove_nfs(self, name): - return self._service_rm_decorate( - 'NFS', name, lambda: self.rook_cluster.rm_service('cephnfses', name) - ) + def remove_service(self, service_type, service_name): + if service_type == 'mds': + return self._service_rm_decorate( + 'MDS', service_name, lambda: self.rook_cluster.rm_service( + 'cephfilesystems', service_name) + ) + elif service_type == 'rgw': + return self._service_rm_decorate( + 'RGW', service_name, lambda: self.rook_cluster.rm_service('cephobjectstores', service_name) + ) + elif service_type == 'nfs': + return self._service_rm_decorate( + 'NFS', service_name, lambda: self.rook_cluster.rm_service('cephnfses', service_name) + ) def update_mons(self, spec): # type: (orchestrator.ServiceSpec) -> RookCompletion -- 2.39.5