openstack
/
kolla
Code Issues Proposed changes

Fix build for oraclelinux base 

centos-release-openstack-mitaka 1.3 is now available via the
delorean-mitaka-testing repo. We need to install this directly instead
of the 1.2 version as otherwise the subsequent 'yum update' tries to
install it and fails on the centos-release dependency which is
incompatible with the oraclelinux base.

Closes-Bug: 1576238

Change-Id: I51cb372424b27b32e95f9e81c5dddbe8e49a6131
This commit is contained in:
Paul Bourke 2016-04-28 14:38:18 +01:00
parent cb8e3b605e
commit d958e24c3d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/base/Dockerfile.j2
View File

@ -101,8 +101,9 @@ RUN yum -y install \
yum-utils \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \
&& yum clean all \
# TODO(pbourke): replace with mirror.centos.org once openstack-mitaka-1-3 is promoted to stable
&& rpm -Uvh --nodeps \
http://mirror.centos.org/centos/7/extras/x86_64/Packages/centos-release-openstack-mitaka-1-2.el7.centos.noarch.rpm \
http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-hammer-1.0-5.el7.centos.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-1.el7.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \