diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-07 21:05:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-07 21:05:18 +0000 |
| commit | 17d5c32f0b0b87dfacfa08879883ad6a22a866db (patch) | |
| tree | 0c54a6b05ad15843564a77365aa5795dee1ec3ce /docker | |
| parent | 78b3446f4827a5f94ad094f59d4011829f097144 (diff) | |
| parent | aeb86de6fc644a514d060b4ac869cab364266f03 (diff) | |
| download | kolla-17d5c32f0b0b87dfacfa08879883ad6a22a866db.tar.gz kolla-17d5c32f0b0b87dfacfa08879883ad6a22a866db.zip | |
Merge "Move RDO to Newton branches"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 34133d104..6c06d6d8b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -80,6 +80,7 @@ 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' ] %} @@ -88,6 +89,7 @@ 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' ] %} @@ -123,13 +125,14 @@ 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://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-openstack-newton-1-1.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 \ |