From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Mar 2019 19:04:22 +0000 (-0600)
Subject: common/util: report CONTAINER_IMAGE in daemon metadata
X-Git-Tag: v14.1.1~45^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=42ae29a129b8bc10a05276b2231d20c857104773;p=ceph-ci.git

common/util: report CONTAINER_IMAGE in daemon metadata

Rook will set this to the registry + image string.

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

diff --git a/src/common/util.cc b/src/common/util.cc
index 68545840e7d..03e7c878448 100644
--- a/src/common/util.cc
+++ b/src/common/util.cc
@@ -164,6 +164,10 @@ void collect_sys_info(map<string, string> *m, CephContext *cct)
     (*m)["container_name"] = container_name;
     in_container = true;
   }
+  if (const char *container_image = getenv("CONTAINER_IMAGE")) {
+    (*m)["container_image"] = container_image;
+    in_container = true;
+  }
   if (in_container) {
     if (const char *node_name = getenv("NODE_NAME")) {
       (*m)["container_hostname"] = u.nodename;