From: Sage Weil <sage@newdream.net>
Date: Fri, 19 Mar 2021 14:46:09 +0000 (-0400)
Subject: mgr/cephadm/upgrade: do not repeat crash message
X-Git-Tag: v17.1.0~2550^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=217ddfeb22ad52f1443bc585c044140d9bf07328;p=ceph.git

mgr/cephadm/upgrade: do not repeat crash message

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index 10615f35d898..820b05396248 100644
--- a/src/pybind/mgr/cephadm/upgrade.py
+++ b/src/pybind/mgr/cephadm/upgrade.py
@@ -636,10 +636,11 @@ class CephadmUpgrade:
                         (count, daemon_type, short_version, target_version))
 
             # push down configs
-            if image_settings.get(daemon_type) != target_image:
+            daemon_type_section = name_to_config_section(daemon_type)
+            if image_settings.get(daemon_type_section) != target_image:
                 logger.info('Upgrade: Setting container_image for all %s' %
                             daemon_type)
-                self.mgr.set_container_image(name_to_config_section(daemon_type), target_image)
+                self.mgr.set_container_image(daemon_type_section, target_image)
             to_clean = []
             for section in image_settings.keys():
                 if section.startswith(name_to_config_section(daemon_type) + '.'):