From 782f00eccd7cc134173ac7e351bc7dba7d617cbb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Nov 2019 09:23:49 -0600 Subject: [PATCH] mgr/ssh: fix update_rgw, update_mgr Signed-off-by: Sage Weil --- src/pybind/mgr/ssh/module.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index 268513660dc0..51220703eeb2 100644 --- a/src/pybind/mgr/ssh/module.py +++ b/src/pybind/mgr/ssh/module.py @@ -944,8 +944,9 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): if num_to_remove > 0: for daemon in daemons: result = self._worker_pool.apply_async( - self._remove_mgr, - (daemon.service_instance, daemon.nodename)) + self._remove_daemon, + ('%s.%s' % (d.service_type, d.service_instance), + d.nodename)) results.append(result) num_to_remove -= 1 if num_to_remove == 0: @@ -1096,7 +1097,9 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): to_remove = len(daemons) - spec.count for d in daemons[0:to_remove]: results.append(self._worker_pool.apply_async( - self._remove_rgw, (d.service_instance, d.nodename))) + self._remove_daemon, + ('%s.%s' % (d.service_type, d.service_instance), + d.nodename))) elif len(daemons) < spec.count: # add some spec.count -= len(daemons) -- 2.47.3