diff options
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 |
2 files changed, 1 insertions, 11 deletions
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', |