From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 3 Aug 2020 09:35:41 +0000 (+0200)
Subject: mgr/cephadm: Refactor upgrade to call _daemon_action with new image
X-Git-Tag: wip-pdonnell-testing-20200918.022351~435^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=289f37d29674b9a26415147a964b1fcb26a7eaf7;p=ceph-ci.git

mgr/cephadm: Refactor upgrade to call _daemon_action with new image

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index dae52697243..0e72e0a7109 100644
--- a/src/pybind/mgr/cephadm/upgrade.py
+++ b/src/pybind/mgr/cephadm/upgrade.py
@@ -307,17 +307,12 @@ class CephadmUpgrade:
                     return
                 logger.info('Upgrade: Redeploying %s.%s' %
                             (d.daemon_type, d.daemon_id))
-                ret, out, err = self.mgr.check_mon_command({
-                    'prefix': 'config set',
-                    'name': 'container_image',
-                    'value': target_name,
-                    'who': name_to_config_section(daemon_type + '.' + d.daemon_id),
-                })
                 self.mgr._daemon_action(
                     d.daemon_type,
                     d.daemon_id,
                     d.hostname,
-                    'redeploy'
+                    'redeploy',
+                    image=target_name
                 )
                 return