diff options
| author | Steven Dake <stdake@cisco.com> | 2016-10-14 13:23:39 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-11-02 03:28:15 -0700 |
| commit | e714a745c65d5729705c71b808e29a2b32c09ae5 (patch) | |
| tree | d397e02a8307e96de9f5d0a7145cea4fdff62154 /docker | |
| parent | 0d5407d55ee2aa96a4cbeea25ae252e11c660371 (diff) | |
| download | kolla-e714a745c65d5729705c71b808e29a2b32c09ae5.tar.gz kolla-e714a745c65d5729705c71b808e29a2b32c09ae5.zip | |
Revert "Move RDO to Newton branches"
Revert note: Get RDO back on master instead of the newton branch
This reverts commit aeb86de6fc644a514d060b4ac869cab364266f03.
Change-Id: I765ba60c3bd09fe3978570b7921a084c9b90c7d0
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index e9fa65db3..9d13b2fc9 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -80,7 +80,6 @@ RUN yum-config-manager --enable rhel-7-server-rpms \ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% set base_centos_yum_repo_keys = [ - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization' ] %} @@ -89,7 +88,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'epel-release ', 'yum-plugin-priorities', 'centos-release-ceph-jewel', - 'centos-release-openstack-newton', 'centos-release-qemu-ev' ] %} @@ -125,14 +123,13 @@ RUN yum -y install \ yum-utils \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-6.noarch.rpm \ && rpm -Uvh --nodeps \ - http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-openstack-newton-1-1.el7.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-jewel-1.0-1.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 \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-1-2.el7.centos.noarch.rpm \ && sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ - && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization \ && yum-config-manager --enable ol7_optional_latest ol7_addons \ |