aboutsummaryrefslogtreecommitdiff
path: root/docker/collectd
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-04-17 17:18:46 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-04-17 18:07:29 +0200
commit6c480c3d890a0d7863afdddcb99bbccfb2ae0cb8 (patch)
treed11514c034c916fb63c0e6f195cb0d01cbd36db9 /docker/collectd
parentb6d152e92dd7a6b59f3b9f248735dacadd26797e (diff)
downloadkolla-6c480c3d890a0d7863afdddcb99bbccfb2ae0cb8.tar.gz
kolla-6c480c3d890a0d7863afdddcb99bbccfb2ae0cb8.zip
Cleanup py27 support
Removes and/or replaces all mentions of py27. Cleans up obsolete requirements and their lower-constraints. Change-Id: Id43f1bbd6a454832ab8dbf003a058403f6b34b5d
Diffstat (limited to 'docker/collectd')
-rw-r--r--docker/collectd/Dockerfile.j27
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' %}