From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Mar 2020 14:29:20 +0000 (-0500)
Subject: mgr/cephadm: clean up client.crash.* container_image settings after upgrade
X-Git-Tag: v15.2.0~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=967a573b0aa6ee45507aae888b8d300fa811bc07;p=ceph.git

mgr/cephadm: clean up client.crash.* container_image settings after upgrade

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 3110bb7da0de..bde6eddc66c5 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -961,7 +961,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 })
             to_clean = []
             for section in image_settings.keys():
-                if section.startswith(daemon_type + '.'):
+                if section.startswith(name_to_config_section(daemon_type) + '.'):
                     to_clean.append(section)
             if to_clean:
                 self.log.debug('Upgrade: Cleaning up container_image for %s...' %