diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-20 15:55:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-20 15:55:08 +0000 |
| commit | 42720bcab86e0008feb7a0f55523d16455960069 (patch) | |
| tree | 236ee26f6a97814e589c8c69e355204b680e0598 /docker | |
| parent | 26ba50c16f4560bcc3a405650d8f608c31b9df8d (diff) | |
| parent | 6c480c3d890a0d7863afdddcb99bbccfb2ae0cb8 (diff) | |
| download | kolla-42720bcab86e0008feb7a0f55523d16455960069.tar.gz kolla-42720bcab86e0008feb7a0f55523d16455960069.zip | |
Merge "Cleanup py27 support"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index aab38754f..a1a958eb0 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -65,15 +65,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_arch =='x86_64' %} {% set collectd_packages = collectd_packages + [ 'collectd-hugepages', + 'collectd-pmu', 'collectd-rdt', 'collectd-turbostat' ] %} - - {% if distro_python_version.startswith('3') %} - {% set collectd_packages = collectd_packages + [ - 'collectd-pmu' - ] %} - {% endif %} {% endif %} {% if base_arch != 's390x' %} |