diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-11-13 12:08:49 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-11-13 12:08:49 +0000 |
| commit | a8abbf34c0373f24d6417f19a2ba27f3d017e10f (patch) | |
| tree | aaa62b435c7241d40e7823eed25a5c36e5f97fa9 /docker | |
| parent | c78c82c9630b334cbaef040d68bce7e5ae8cc118 (diff) | |
| download | kolla-a8abbf34c0373f24d6417f19a2ba27f3d017e10f.tar.gz kolla-a8abbf34c0373f24d6417f19a2ba27f3d017e10f.zip | |
Revert "Move to RDO Train packages"
This reverts commit c78c82c9630b334cbaef040d68bce7e5ae8cc118.
Change-Id: I61c68bf738673a96dd5ba256e40e8532364ff281
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9858f7c0d..170885346 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -164,14 +164,12 @@ 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 a35b4b297..a3cc0747b 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', - 'python2-collectd-gnocchi', + 'python-collectd-gnocchi', 'python2-collectd-rabbitmq-monitoring', 'python2-sqlalchemy-collectd' ] %} |