From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Feb 2020 20:37:47 +0000 (-0600)
Subject: mgr/upgrade: fix mgr self check
X-Git-Tag: v15.1.1~511^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=54e474571e573904a02cd1ce69adb7386d640ded;p=ceph.git

mgr/upgrade: fix mgr self check

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 796b15dee5c1f..78fc77b0928fa 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