aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-23 03:45:03 +0000
committerSam Yaple <sam@yaple.net>2015-08-23 03:45:03 +0000
commit5dcf175cb5e8220ca679210b4ebd0d6a4124d4a3 (patch)
treebb536c50aba1d61acbe9167613c34af1c4330ff4
parentf70e8d4598c58f8b2904542f7e0d87c693f70761 (diff)
downloadkolla-5dcf175cb5e8220ca679210b4ebd0d6a4124d4a3.tar.gz
kolla-5dcf175cb5e8220ca679210b4ebd0d6a4124d4a3.zip
Record the distro and install_type variables
We set two environment variables to record the needed info to do conditionals in the start.sh and config-external.sh scripts Change-Id: I08acb489e214b3dc961331bb870b435c17100635 Paritially-Implements: blueprint install-from-ubuntu
-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'] %}