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/swift/swift-base/Dockerfile.j2 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'docker/swift') diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 03c41c2bd..df1ed30c9 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -4,15 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install openstack-swift && yum clean all - - {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \ - && /bin/false +RUN yum -y install openstack-swift \ + && yum clean all {% endif %} - {% elif install_type == 'source' %} ADD swift-base-archive /swift-base-source -- cgit v1.2.3