diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-27 08:10:59 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-27 08:10:59 +0000 |
| commit | 39aba34b2a884887cab117ff233469051cc2ec22 (patch) | |
| tree | 8be9152d0c8c19ed19b45f214a866e9473bbbfb0 /docker/nova/nova-base | |
| parent | 7ef0b8966cf7cce1d5de031f58e826e85209d980 (diff) | |
| download | kolla-39aba34b2a884887cab117ff233469051cc2ec22.tar.gz kolla-39aba34b2a884887cab117ff233469051cc2ec22.zip | |
Remove all fail sections for Ubuntu
Ubuntu binary is not supported and may never be. Installing from
cloud-archive packaging is only for the current stable distros, Ubuntu
does not have a Delorean type repo. We place a fail message in the
base image to catch this and remove the messages throughout the
project.
An additional fail message is placed to catch all other things.
Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7
Implements: blueprint install-from-ubuntu
Diffstat (limited to 'docker/nova/nova-base')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 293cbaeea..8032090aa 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -12,17 +12,11 @@ RUN yum -y install \ bridge-utils \ && yum clean all - {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install \ - bridge-utils \ +RUN yum -y install bridge-utils \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} |