From 53443c5c712f4ec23b859105e94bcd90abc27762 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 9 Mar 2020 17:44:54 +0100 Subject: Remove support for CentOS 7 With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9 --- docker/collectd/Dockerfile.j2 | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'docker/collectd') diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index f35081574..e5b7e9bf4 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -54,18 +54,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'collectd-write_http', 'collectd-write_kafka', 'collectd-write_prometheus', - ] %} - - {% if distro_python_version.startswith('3') %} - {% set collectd_packages = collectd_packages + [ 'python3-sqlalchemy-collectd' ] %} - {% else %} - {% set collectd_packages = collectd_packages + [ - 'python2-collectd-rabbitmq-monitoring', - 'python2-sqlalchemy-collectd' - ] %} - {% endif %} {% if base_arch in ['x86_64', 'ppc64le'] %} {% set collectd_packages = collectd_packages + [ -- cgit v1.2.3