From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Mar 2020 02:05:38 +0000 (-0600)
Subject: mgr/cephadm: fix upgrade when daemon is stopped
X-Git-Tag: v15.1.1~144^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac73ccc0b1f5a8d27d87416810a8f8e9724a97bc;p=ceph.git

mgr/cephadm: fix upgrade when daemon is stopped

Tried to fix this in 5649d5571c14 but didn't remove the early image_id
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 1093677b513..fcea7a7b2c2 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -744,18 +744,14 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             for d in daemons:
                 if d.daemon_type != daemon_type:
                     continue
-                if not d.container_image_id:
-                    self.log.debug('daemon %s.%s image_id is not known' % (
-                        daemon_type, d.daemon_id))
-                    return None
                 if d.container_image_id == target_id:
                     self.log.debug('daemon %s.%s version correct' % (
                         daemon_type, d.daemon_id))
                     done += 1
                     continue
-                self.log.debug('daemon %s.%s version incorrect (%s, %s)' % (
+                self.log.debug('daemon %s.%s not correct (%s, %s, %s)' % (
                     daemon_type, d.daemon_id,
-                    d.container_image_id, d.version))
+                    d.container_image_name, d.container_image_id, d.version))
 
                 if daemon_type == 'mgr' and \
                    d.daemon_id == self.get_mgr_id():