diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 09:42:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 09:42:43 +0000 |
| commit | 5b482b68c289948a747a21b6a1510990bf337990 (patch) | |
| tree | 62187c7b7c8e7a4efe44382cce3966abb383e94f /docker/swift | |
| parent | 385658b77662a06ae7b0eb7320897be13065cbd0 (diff) | |
| parent | 39aba34b2a884887cab117ff233469051cc2ec22 (diff) | |
| download | kolla-5b482b68c289948a747a21b6a1510990bf337990.tar.gz kolla-5b482b68c289948a747a21b6a1510990bf337990.zip | |
Merge "Remove all fail sections for Ubuntu"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 9 |
1 files changed, 2 insertions, 7 deletions
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 |