From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Nov 2019 15:23:49 +0000 (-0600)
Subject: mgr/ssh: fix update_rgw, update_mgr
X-Git-Tag: v15.1.0~977^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=782f00eccd7cc134173ac7e351bc7dba7d617cbb;p=ceph.git

mgr/ssh: fix update_rgw, update_mgr

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 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)