From dfecbb19f5e71762791ee275499bd2c9173a7ecf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 5 Mar 2020 21:27:26 -0600 Subject: [PATCH] mgr/cephadm: upgrade all ceph daemon types Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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', -- 2.39.5