diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-29 05:17:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-29 05:17:24 +0000 |
| commit | dcc372387642d8f301f765042da4e51e5267b9b2 (patch) | |
| tree | 22d48cf74b832d8ac98cc981d4645fe02552b5fc /docker | |
| parent | 649686584fcc005ec2a49f1ae0698a24d0857aae (diff) | |
| parent | 8eb2f83eee2275ca91ef456e2fcad6b9d781fe75 (diff) | |
| download | kolla-dcc372387642d8f301f765042da4e51e5267b9b2.tar.gz kolla-dcc372387642d8f301f765042da4e51e5267b9b2.zip | |
Merge "Use rdo magnum instead of sdake's copr for magnum"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index d4c84c315..e29f1e06d 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -2,25 +2,12 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} - {% if base_distro in ['centos'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} -RUN curl -L https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo \ - && rpm --import https://copr-be.cloud.fedoraproject.org/results/sdake/openstack-magnum/pubkey.gpg \ +RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo \ && yum install -y openstack-magnum-common \ && yum clean all - {% elif base_distro in ['fedora'] %} - -RUN curl -L 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 \ - && rpm --import https://copr-be.cloud.fedoraproject.org/results/sdake/openstack-magnum/pubkey.gpg \ - && yum install -y openstack-magnum-common \ - && yum clean all - - {% elif base_distro in ['oraclelinux'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - {% endif %} {% elif install_type == 'source' %} |