aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-23 07:38:22 +0000
committerGerrit Code Review <review@openstack.org>2015-08-23 07:38:22 +0000
commitcda323898dfd71a906fc0c379bf6ade4755621ef (patch)
treeb49c005068a0cf730860b9856b5a6002012d343e
parent606450d5cb159f286ce2761556104968bcdee6a9 (diff)
parent5dcf175cb5e8220ca679210b4ebd0d6a4124d4a3 (diff)
downloadkolla-cda323898dfd71a906fc0c379bf6ade4755621ef.tar.gz
kolla-cda323898dfd71a906fc0c379bf6ade4755621ef.zip
Merge "Record the distro and install_type variables"
-rwxr-xr-xdocker_templates/base/Dockerfile.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/docker_templates/base/Dockerfile.j2 b/docker_templates/base/Dockerfile.j2
index f1e9ecdc3..7b498ed40 100755
--- a/docker_templates/base/Dockerfile.j2
+++ b/docker_templates/base/Dockerfile.j2
@@ -3,6 +3,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{{ include_header }}
+ENV KOLLA_BASE_DISTRO {{ base_distro }}
+ENV KOLLA_INSTALL_TYPE {{ install_type }}
+
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux'] %}