From 217ddfeb22ad52f1443bc585c044140d9bf07328 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 19 Mar 2021 10:46:09 -0400 Subject: [PATCH] mgr/cephadm/upgrade: do not repeat crash message Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/upgrade.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index 10615f35d8980..820b05396248a 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) + '.'): -- 2.39.5