diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-16 13:32:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-16 13:32:03 +0000 |
| commit | f972cf68689f6ed4c83a45e73ca4f8b7e91574e0 (patch) | |
| tree | 28f82192a1703fb25838756d633a36f668f82433 /docker | |
| parent | 81fab723da125586766e2b25bd4e655bcaec2108 (diff) | |
| parent | 8a6aa9e5959990a88e7eacd95cb3a833e5971f59 (diff) | |
| download | kolla-f972cf68689f6ed4c83a45e73ca4f8b7e91574e0.tar.gz kolla-f972cf68689f6ed4c83a45e73ca4f8b7e91574e0.zip | |
Merge "add dpdk_telemetry and logparser for C8, use centos-release-opstools for C8" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index efe219627..f46d71d3e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -211,18 +211,19 @@ 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-OpsTools', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. {% if distro_package_manager == 'yum' %} {% set base_centos_yum_repo_keys = 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', ] %} {% endif %} {% set base_centos_yum_repo_packages = [ + 'centos-release-opstools', 'epel-release', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. @@ -230,7 +231,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ 'centos-release-openstack-train', 'centos-release-ceph-nautilus', - 'centos-release-opstools', 'centos-release-qemu-ev', ] %} # FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index f4447ff2b..de84c669e 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -53,6 +53,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if distro_python_version.startswith('3') %} {% set collectd_packages = collectd_packages + [ + 'collectd-dpdk_telemetry', + 'collectd-logparser', 'python3-sqlalchemy-collectd' ] %} {% else %} |