]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: remove dup check
authorSage Weil <sage@redhat.com>
Wed, 22 Jan 2020 22:27:42 +0000 (16:27 -0600)
committerSage Weil <sage@redhat.com>
Wed, 22 Jan 2020 22:27:42 +0000 (16:27 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index dca283f55741d4c8b064909d979f27fb78e6c991..958ed1eef4ce85e98d78cfae3bd3974906e49a15 100644 (file)
@@ -444,8 +444,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                 if d.container_image_id == target_id:
                     continue
 
-                if daemon_type == 'mgr' and \
-                   d.service_instance == self.get_mgr_id():
+                if 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