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 1390eef4a7c4b5e584c0f753da32ce44a2851f15..04e6ec113562d2443f1df66ebea82e1bb60de195 100644 (file)
--- 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',