From ef10bc08e340026eb53c51f68a804a5b8aa5d9be Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Wed, 23 Dec 2020 13:26:02 +0000 Subject: [PATCH] mgr/rook: Remove service_type param from remove_service() Orchestrator defines service name as ".". The remove_service method requires only service_name as parameter. Removing service_type parameter fixes the type error. Fixes: https://tracker.ceph.com/issues/47968 Signed-off-by: Varsha Rao --- src/pybind/mgr/rook/module.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py index eda8571196c..cef24e5c27c 100644 --- a/src/pybind/mgr/rook/module.py +++ b/src/pybind/mgr/rook/module.py @@ -451,12 +451,13 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator): def _service_rm_decorate(self, typename, name, func): return write_completion( - on_complete=lambda : func(name), + on_complete=lambda : func(), message="Removing {} services for {}".format(typename, name), mgr=self ) - def remove_service(self, service_type, service_name): + def remove_service(self, service_name): + service_type, service_name = service_name.split('.', 1) if service_type == 'mds': return self._service_rm_decorate( 'MDS', service_name, lambda: self.rook_cluster.rm_service( -- 2.47.3