diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-04 11:31:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-04 11:31:01 +0000 |
| commit | e8348d033a7496c2c5934d248e3ea2f8b125e44e (patch) | |
| tree | 06615ec21791fd06c1d0b219eea49f7af2198504 /docker/base/Dockerfile.j2 | |
| parent | 33484d7a792711903a05b3956e69ad2005ee00df (diff) | |
| parent | db53ad1ddf4f3b87582fbd2a8516b77d9c031723 (diff) | |
| download | kolla-e8348d033a7496c2c5934d248e3ea2f8b125e44e.tar.gz kolla-e8348d033a7496c2c5934d248e3ea2f8b125e44e.zip | |
Merge "Move the install base type check to kolla-build"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f0284d293..4fe02e7e1 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -3,28 +3,6 @@ MAINTAINER {{ maintainer }} LABEL kolla_version="{{ kolla_version }}" -{# Early failure for bases and types #} -{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} - {% if install_type not in ['source', 'binary', 'rdo', 'rhel'] %} - -RUN echo 'ERROR: {{ install_type }} is unavailable for {{ base_distro }}' \ - && /bin/false - - {% endif %} -{% elif base_distro in ['ubuntu', 'debian'] %} - {% if install_type not in ['source','binary'] %} - -RUN echo 'ERROR: {{ install_type }} is unavailable for {{ base_distro }}' \ - && /bin/false - - {% endif %} -{% else %} - -RUN echo 'ERROR: The specified distro has no Kolla images to build: "{{ base_distro }}"' \ - && /bin/false - -{% endif %} - {{ include_header }} |