aboutsummaryrefslogtreecommitdiff
path: root/docker/glance
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-28 09:42:43 +0000
committerGerrit Code Review <review@openstack.org>2015-09-28 09:42:43 +0000
commit5b482b68c289948a747a21b6a1510990bf337990 (patch)
tree62187c7b7c8e7a4efe44382cce3966abb383e94f /docker/glance
parent385658b77662a06ae7b0eb7320897be13065cbd0 (diff)
parent39aba34b2a884887cab117ff233469051cc2ec22 (diff)
downloadkolla-5b482b68c289948a747a21b6a1510990bf337990.tar.gz
kolla-5b482b68c289948a747a21b6a1510990bf337990.zip
Merge "Remove all fail sections for Ubuntu"
Diffstat (limited to 'docker/glance')
-rw-r--r--docker/glance/glance-base/Dockerfile.j26
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index ef5fcfb39..cc628b883 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
@@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
RUN yum -y install \
openstack-glance \
python-oslo-i18n \
@@ -12,11 +11,6 @@ RUN yum -y install \
python-cryptography \
&& 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 ['ubuntu', 'debian'] %}