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 1093677b513412ce7940926838102e784af25346..fcea7a7b2c22a1e4481a420a5921c61fa1df6c11 100644 (file)
--- 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():