From 3798a3153b1092489f4faf70e10d2bc3adca88af Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 2 Dec 2019 15:06:42 -0600 Subject: [PATCH] mgr/ssh: fix remove_osds Broken by the new completions Signed-off-by: Sage Weil --- src/pybind/mgr/ssh/module.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index 9975f7fd111..7676eb1a626 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=[]): -- 2.39.5