From: Varsha Rao <varao@redhat.com>
Date: Wed, 23 Dec 2020 13:26:02 +0000 (+0000)
Subject: mgr/rook: Remove service_type param from remove_service()
X-Git-Tag: v16.1.0~124^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef10bc08e340026eb53c51f68a804a5b8aa5d9be;p=ceph.git

mgr/rook: Remove service_type param from remove_service()

Orchestrator defines service name as "<service_type>.<service_id>". 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 <varao@redhat.com>
---

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(