openstack
/
kolla
Code Issues Proposed changes

Use the liberty release RDO RPMS 

Previously stable/liberty was using the Delorean repositories for
installing RPM packaging.  Delorean is master, and up until just about
now that made sense, but going forward, we want to use the Liberty
release of RDO rather then Mitaka for stable/liberty ;)

Closes-Bug: #1508127

Change-Id: I675c434d25419853bb3ce6442d1b4db6ea448af0
This commit is contained in:
Steven Dake 2015-10-20 14:07:30 -04:00
parent d08795865c
commit 9c13b4f15f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/base/Dockerfile.j2
View File

@ -49,11 +49,10 @@ RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat
{% if install_metatype == 'rdo' %}
# 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
RUN curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo
# This repository provides latest packages built from liberty stable branches
RUN yum -y install \
http://rdoproject.org/repos/openstack-liberty/rdo-release-liberty.rpm \
&& yum clean all
{% endif %}
# endif for repo setup for all RHEL except RHEL OSP
@ -135,8 +134,9 @@ RUN yum install -y \
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# Set up repositories
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
# This repository provides latest packages built from liberty stable branches
RUN yum -y install \
http://rdoproject.org/repos/openstack-liberty/rdo-release-liberty.rpm \
&& yum clean all
{% endif %}