From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Feb 2020 19:52:05 +0000 (-0600)
Subject: mgr/cephadm: refresh if we don't know a daemon's image_id
X-Git-Tag: v15.1.1~511^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ff43bcbb794e644c6b7b9c33b6e7e9467f5ea04;p=ceph.git

mgr/cephadm: refresh if we don't know a daemon's image_id

This notably happens right after we deploy a fresh daemon.

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 ba93e54ad68d2..51ab2ccee9b46 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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))