From d5ecb3327c65e37feb503676840bd188f4bc6fe6 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 3 Feb 2022 15:52:19 +0100
Subject: Remove missing collectd packages

Since CentOS Linux 8 repository retirement from
CentOS mirrors - we need to use CentOS Stream 8
version of Opstools repo.

Listed below packages are missing from the repo,
and according to the maintainer dpdk_telemetry is
not going to show up at all (it's basically dead).

The rest of the packages might show up at a later
stage - but it's not a priority for the maintainer.

- collectd-dpdk_telemetry
- collectd-libpod-stats
- collectd-sensubility
- python3-sqlalchemy-collectd

Change-Id: I5f446fc276e245c1e6974ceeb6ff3dccd84ee502
(cherry picked from commit 405fca90f2c8d3763ac56ce8b925611d136bba6c)
---
 docker/collectd/Dockerfile.j2       | 11 +----------
 docker/openstack-base/Dockerfile.j2 |  1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'docker')

diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index 9302f72a2..60b58e889 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -40,7 +40,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'collectd-procevent',
       'collectd-python',
       'collectd-sensors',
-      'collectd-sensubility',
       'collectd-smart',
       'collectd-snmp',
       'collectd-snmp-agent',
@@ -51,15 +50,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'collectd-write_kafka',
       'collectd-write_prometheus',
   ] %}
-
-  {% if distro_python_version.startswith('3') %}
-  {% set collectd_packages = collectd_packages + [
-      'collectd-dpdk_telemetry',
-      'collectd-libpod-stats',
-      'collectd-logparser',
-      'python3-sqlalchemy-collectd'
-  ] %}
-  {% else %}
+  {% if distro_python_version.startswith('2') %}
   {% set collectd_packages = collectd_packages + [
       'python2-collectd-gnocchi',
       'python2-collectd-rabbitmq-monitoring',
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 408a2af63..42ac51a79 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -85,7 +85,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python3-routes',
             'python3-saharaclient',
             'python3-sqlalchemy',
-            'python3-sqlalchemy-collectd',
             'python3-sqlparse',
             'python3-swiftclient',
             'python3-sysv_ipc',
-- 
cgit v1.2.3