From 39aba34b2a884887cab117ff233469051cc2ec22 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sun, 27 Sep 2015 08:10:59 +0000 Subject: 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 --- docker/nova/nova-base/Dockerfile.j2 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'docker/nova') 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'] %} -- cgit v1.2.3