From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Dec 2019 21:06:42 +0000 (-0600)
Subject: mgr/ssh: fix remove_osds
X-Git-Tag: v15.1.0~686^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31952%2Fhead;p=ceph.git

mgr/ssh: fix remove_osds

Broken by the new completions

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 9975f7fd111b..7676eb1a6267 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -971,11 +971,12 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
         return self.get_hosts().then(lambda hosts: self._create_osd(hosts, drive_group))
 
     def remove_osds(self, name):
-        daemons = self._get_services('osd', service_id=name)
-        args = [('osd.%s' % d.service_instance, d.nodename) for d in daemons]
-        if not args:
-            raise OrchestratorError('Unable to find osd.%s' % name)
-        return self._remove_daemon(args)
+        def _search(daemons):
+            args = [('osd.%s' % d.service_instance, d.nodename) for d in daemons]
+            if not args:
+                raise OrchestratorError('Unable to find osd.%s' % name)
+            return self._remove_daemon(args)
+        return self._get_services('osd', service_id=name).then(_search)
 
     def _create_daemon(self, daemon_type, daemon_id, host, keyring,
                        extra_args=[]):