diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-02 18:38:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-02 18:38:37 +0000 |
| commit | 723ca0470330b562e3f7ae530411959dd2bd5bb4 (patch) | |
| tree | 4c4de4cd1f1b974be9b1089288077bf3e059fb9f /docker | |
| parent | bd8d65329b2df66ab588c7d104b3ccdf94296aea (diff) | |
| parent | e714a745c65d5729705c71b808e29a2b32c09ae5 (diff) | |
| download | kolla-723ca0470330b562e3f7ae530411959dd2bd5bb4.tar.gz kolla-723ca0470330b562e3f7ae530411959dd2bd5bb4.zip | |
Merge "Revert "Move RDO to Newton branches""
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 9d349ee09..f762276fe 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' ] %} @@ -127,14 +125,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 \ |