diff options
| author | Allen Gao <wanlong.gao@easystack.cn> | 2016-02-01 20:08:57 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-02-04 16:48:12 +0800 |
| commit | db53ad1ddf4f3b87582fbd2a8516b77d9c031723 (patch) | |
| tree | e4afa067d83ed2d2a5fec7ecdc8210c42b4de264 /docker | |
| parent | 1057dcd50a8963e5220f7ca5cc7b66183a06340e (diff) | |
| download | kolla-db53ad1ddf4f3b87582fbd2a8516b77d9c031723.tar.gz kolla-db53ad1ddf4f3b87582fbd2a8516b77d9c031723.zip | |
Move the install base type check to kolla-build
The install type is converted in kolla-build, so it will never
fail in dockerfile, move the check to kolla-build just above
the install type converting.
TrivialFix
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: I1500d3b47e909f94ea9f68c5245297733f63a70b
Diffstat (limited to 'docker')
| -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 }} |