From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 03:27:26 +0000 (-0600)
Subject: mgr/cephadm: upgrade all ceph daemon types
X-Git-Tag: v15.1.1~83^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfecbb19f5e71762791ee275499bd2c9173a7ecf;p=ceph-ci.git

mgr/cephadm: upgrade all ceph daemon types

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 1390eef4a7c..04e6ec11356 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -784,7 +784,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
 
         daemons = self.cache.get_daemons()
         done = 0
-        for daemon_type in ['mgr', 'mon', 'osd', 'rgw', 'mds', 'crash']:
+        for daemon_type in CEPH_TYPES:
             self.log.info('Upgrade: Checking %s daemons...' % daemon_type)
             need_upgrade_self = False
             for d in daemons:
@@ -922,6 +922,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                         'name': 'container_image',
                         'who': section,
                     })
+
             self.log.info('Upgrade: All %s daemons are up to date.' %
                           daemon_type)
 
@@ -933,7 +934,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             'value': target_name,
             'who': 'global',
         })
-        for daemon_type in ['mgr', 'mon', 'osd', 'rgw', 'mds']:
+        for daemon_type in CEPH_TYPES:
             ret, image, err = self.mon_command({
                 'prefix': 'config rm',
                 'name': 'container_image',