]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
common/util: report CONTAINER_IMAGE in daemon metadata
authorSage Weil <sage@redhat.com>
Mon, 4 Mar 2019 19:04:22 +0000 (13:04 -0600)
committerSage Weil <sage@redhat.com>
Mon, 4 Mar 2019 19:04:22 +0000 (13:04 -0600)
Rook will set this to the registry + image string.

Signed-off-by: Sage Weil <sage@redhat.com>
src/common/util.cc

index 68545840e7d799a4a9ba133f64cf14434e643347..03e7c878448c5a73f4169d04050601d0d4a417fc 100644 (file)
@@ -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;