From 54e474571e573904a02cd1ce69adb7386d640ded Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 6 Feb 2020 14:37:47 -0600 Subject: [PATCH] mgr/upgrade: fix mgr self check Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 796b15dee5c..78fc77b0928 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -534,7 +534,8 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): daemon_type, d.service_instance, d.container_image_id, d.version)) - if d.service_instance == self.get_mgr_id(): + if daemon_type == 'mgr' and \ + d.service_instance == self.get_mgr_id(): self.log.info('Upgrade: Need to upgrade myself (mgr.%s)' % self.get_mgr_id()) need_upgrade_self = True -- 2.39.5