]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: refresh if we don't know a daemon's image_id
authorSage Weil <sage@redhat.com>
Thu, 6 Feb 2020 19:52:05 +0000 (13:52 -0600)
committerSage Weil <sage@redhat.com>
Fri, 7 Feb 2020 14:27:59 +0000 (08:27 -0600)
This notably happens right after we deploy a fresh daemon.

Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index ba93e54ad68d2fb2a8587d3e84b290ad24ffbb76..51ab2ccee9b46213b79a0d7e5d180b46bfe6e2d0 100644 (file)
@@ -503,6 +503,10 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
             for d in daemons:
                 if d.service_type != daemon_type:
                     continue
+                if not d.container_image_id:
+                    self.log.debug('daemon %s.%s image_id is not known' % (
+                        daemon_type, d.service_instance))
+                    return None
                 if d.container_image_id == target_id:
                     self.log.debug('daemon %s.%s version correct' % (
                         daemon_type, d.service_instance))