From c7a9835b683d0177c93dd2751ec9acb688e106f9 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Wed, 21 Oct 2015 04:53:36 -0400 Subject: [PATCH] Improve dry-ness of base dockerfile.j2 The delorean repositories no longer have a separate location for openvswitch. Now openvswitch is located in delorean-deps.repo and the rest of delorean master is located in the delorean.repo file. These files can be installed for both RDO and SOURCE, but not for RHOS. This patch uses the install_metatype to make a determination as to when to install these two repos. In the process, we can remove the source RPM installation. Change-Id: Ieedddd9d7ee234b6acdb03f7043d57c18e024951 Closes-Bug: #1508326 --- docker/base/Dockerfile.j2 | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 502103d4e3..e1ef6d7ae2 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -47,12 +47,10 @@ COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \ && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo - {% if install_metatype == 'rdo' %} + {% if install_metatype in ['rdo', 'mixed'] %} -# This repository provides all dependencies used by RDO OpenStack -RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm -# This repository provides latest packages built from trunk master into RPMs -RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo +# These repos provide latest packages built from trunk master into RPMs +RUN curl http://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo -o /etc/yum.repos.d/delorean.repo RUN curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo {% endif %} @@ -133,14 +131,6 @@ RUN yum install -y \ {% if install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - -# Set up repositories -RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \ - && yum clean all - - {% endif %} - # Update packages RUN yum -y install \ curl \