From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Feb 2020 18:02:28 +0000 (-0600)
Subject: cephadm: report image name for stopped daemons
X-Git-Tag: v15.1.1~478^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33190%2Fhead;p=ceph.git

cephadm: report image name for stopped daemons

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 203cb7250a3d..504630b13f62 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2292,6 +2292,13 @@ def list_daemons(detail=True, legacy_dir=None):
                             else:
                                 # FIXME: monitoring component version?
                                 pass
+                        else:
+                            vfile = os.path.join(data_dir, fsid, j, 'unit.image') # type: ignore
+                            try:
+                                with open(vfile, 'r') as f:
+                                    image_name = f.read().strip() or None
+                            except IOError:
+                                pass
                         i['container_id'] = container_id
                         i['container_image_name'] = image_name
                         i['container_image_id'] = image_id