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 796b15dee5c1f5b005398c7208be27b5b2db4847..78fc77b0928faefc1550e17063cc148073c257ea 100644 (file)
--- 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