]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-osd: Add CONTAINER_IMAGE env variable
authorDimitri Savineau <dsavinea@redhat.com>
Thu, 27 Jun 2019 14:26:40 +0000 (10:26 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 27 Jun 2019 14:38:02 +0000 (16:38 +0200)
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>
roles/ceph-osd/templates/ceph-osd-run.sh.j2

index 755093b495c43a868d5ebcc1173ed2c53220618f..f04f21c2b75ab768d30dd806dcc30235626830de 100644 (file)
@@ -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 }} \