From 6c480c3d890a0d7863afdddcb99bbccfb2ae0cb8 Mon Sep 17 00:00:00 2001
From: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Date: Fri, 17 Apr 2020 17:18:46 +0200
Subject: Cleanup py27 support

Removes and/or replaces all mentions of py27.

Cleans up obsolete requirements and their lower-constraints.

Change-Id: Id43f1bbd6a454832ab8dbf003a058403f6b34b5d
---
 docker/collectd/Dockerfile.j2 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'docker')

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' %}
-- 
cgit v1.2.3