From c78c82c9630b334cbaef040d68bce7e5ae8cc118 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 21 Oct 2019 12:02:30 +0200 Subject: Move to RDO Train packages Change-Id: I396f929ecc11f87fb83585bedd39be93a605c57b --- docker/base/Dockerfile.j2 | 2 ++ docker/collectd/Dockerfile.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 170885346..9858f7c0d 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', diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index a3cc0747b..a35b4b297 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -61,7 +61,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'collectd-procevent', 'collectd-snmp-agent', 'collectd-sysevent', - 'python-collectd-gnocchi', + 'python2-collectd-gnocchi', 'python2-collectd-rabbitmq-monitoring', 'python2-sqlalchemy-collectd' ] %} -- cgit v1.2.3