From 8eb2f83eee2275ca91ef456e2fcad6b9d781fe75 Mon Sep 17 00:00:00 2001 From: Vikas Jain Date: Thu, 28 Jan 2016 16:59:03 -0800 Subject: [PATCH] Use rdo magnum instead of sdake's copr for magnum Steve is tired of maintaining a copr for Magnum. People bug him all the time to update the rpm for RDO. The RDO community has offered to take on the maintainance of the Magnum RPM. As this RPM won't be in current-passed-ci for some time so it needs to be pulled from current repo for the foreseeable future, possibly nearing the release of Mitaka. Change-Id: I9cfb02ab828251ef5bf40ca236f18b5f0f715e34 Closes-Bug: #1539325 --- docker/magnum/magnum-base/Dockerfile.j2 | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index d4c84c3156..e29f1e06de 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' %}