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/magnum | |
| 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/magnum')
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index aa81301b9..dc16cb447 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -10,10 +10,10 @@ RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7 RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo - {% elif base_distro in ['ubuntu', 'debian', 'oraclelinux'] %} + {% elif base_distro in ['oraclelinux'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + && /bin/false {% endif %} {% elif install_type == 'source' %} |