aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-26 13:24:19 +0000
committerGerrit Code Review <review@openstack.org>2019-10-26 13:24:19 +0000
commit7b309f830034319e3f7db8efb424448e43ccae21 (patch)
tree9bcb9496196c4d348947aee7b3cd6dfaa487680a /docker/base
parent88f374c914c4d6709a1edf407a912c8cf566038b (diff)
parentc78c82c9630b334cbaef040d68bce7e5ae8cc118 (diff)
downloadkolla-7b309f830034319e3f7db8efb424448e43ccae21.tar.gz
kolla-7b309f830034319e3f7db8efb424448e43ccae21.zip
Merge "Move to RDO Train packages"
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 04aeee35a..16c0e1d5a 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -164,12 +164,14 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
{% endblock %}
{% 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-OpsTools',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
] %}
{% set base_centos_yum_repo_packages = [
+ 'centos-release-openstack-train',
'centos-release-ceph-nautilus',
'centos-release-opstools',
'centos-release-qemu-ev',