diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-14 21:42:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-14 21:42:47 +0000 |
| commit | 4ff1255022a6e6bc8725caf0f42b455f66fb6e6d (patch) | |
| tree | 73a57ac68c5b314753a24ceac59d18728b18ab27 /docker | |
| parent | 4ffff0c1830941b865f357ef9d66540b9c110964 (diff) | |
| parent | a8abbf34c0373f24d6417f19a2ba27f3d017e10f (diff) | |
| download | kolla-4ff1255022a6e6bc8725caf0f42b455f66fb6e6d.tar.gz kolla-4ff1255022a6e6bc8725caf0f42b455f66fb6e6d.zip | |
Merge "Revert "Move to RDO Train packages""
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 69d6b2e48..e3d00cee6 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' ] %} |