diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2019-10-21 12:02:30 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2019-10-21 12:49:31 +0200 |
| commit | c78c82c9630b334cbaef040d68bce7e5ae8cc118 (patch) | |
| tree | cb6cd58d2396c1f425aed71e3e3e6234d3642b00 /docker | |
| parent | 3887db89af16822404c37e0ceabb76bb9614722a (diff) | |
| download | kolla-c78c82c9630b334cbaef040d68bce7e5ae8cc118.tar.gz kolla-c78c82c9630b334cbaef040d68bce7e5ae8cc118.zip | |
Move to RDO Train packages
Change-Id: I396f929ecc11f87fb83585bedd39be93a605c57b
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 1 deletions
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' ] %} |