From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 27 Jun 2019 14:26:40 +0000 (-0400)
Subject: ceph-osd: Add CONTAINER_IMAGE env variable
X-Git-Tag: v5.0.0alpha1~247
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=02fbe76e62881377a4f46ee74e8ac37299f99c59;p=ceph-ansible.git

ceph-osd: Add CONTAINER_IMAGE env variable

This environment variable was added in cb381b4 but was removed in
4d35e9e.
This commit reintroduces the change.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index 755093b49..f04f21c2b 100644
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -51,6 +51,7 @@ numactl \
   {% endif -%}
   -v /run/lvm/:/run/lvm/ \
   -e CEPH_DAEMON=OSD_CEPH_VOLUME_ACTIVATE \
+  -e CONTAINER_IMAGE={{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \
   -e OSD_ID="$1" \
   --name=ceph-osd-"$1" \
   {{ ceph_osd_docker_extra_env }} \