Migrate to pyproject.toml

[tool.setuptools.data-files] does not support recursive directory
installation. The old setup.cfg [files] worked because PBR's
FilesConfig.expand_globs() used os.walk() to expand docker/*, but
this hook is not triggered by the pbr.build PEP-517 backend.

Move docker/ into kolla/ and use [tool.setuptools.package-data]
instead. Update kolla_worker._get_images_dir() to check the kolla
package directory first so both editable and regular installs work.

Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>

2 files changed, 0 insertions, 89 deletions

diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
deleted file mode 100644
index 32ded377e..000000000
--- a/docker/collectd/Dockerfile.j2
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block collectd_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='collectd') }}
-
-{% set collectd_packages = [
-    'collectd'
-] %}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['opstools']) }}
-
-  {% set collectd_packages = collectd_packages + [
-      'collectd-amqp',
-      'collectd-amqp1',
-      'collectd-apache',
-      'collectd-bind',
-      'collectd-ceph',
-      'collectd-chrony',
-      'collectd-connectivity',
-      'collectd-curl',
-      'collectd-curl_json',
-      'collectd-curl_xml',
-      'collectd-dbi',
-      'collectd-disk',
-      'collectd-dns',
-      'collectd-ipmi',
-      'collectd-logparser',
-      'collectd-mcelog',
-      'collectd-mysql',
-      'collectd-netlink',
-      'collectd-openldap',
-      'collectd-ovs-events',
-      'collectd-ovs-stats',
-      'collectd-ping',
-      'collectd-procevent',
-      'collectd-python',
-      'collectd-sensors',
-      'collectd-smart',
-      'collectd-snmp',
-      'collectd-snmp-agent',
-      'collectd-sysevent',
-      'collectd-utils',
-      'collectd-virt',
-      'collectd-write_http',
-      'collectd-write_kafka',
-      'collectd-write_prometheus',
-  ] %}
-
-  {% if base_arch =='x86_64' %}
-      {% set collectd_packages = collectd_packages + [
-        'collectd-hugepages',
-        'collectd-pcie-errors',
-        'collectd-pmu',
-        'collectd-rdt',
-        'collectd-turbostat'
-      ] %}
-  {% endif %}
-
-{% endif %}
-
-{{ macros.install_packages(collectd_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start \
-    && chown -R collectd /var/lib/collectd \
-    && chown -R collectd /var/run/
-
-{{ macros.kolla_patch_sources() }}
-
-{% block collectd_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER collectd
diff --git a/docker/collectd/extend_start.sh b/docker/collectd/extend_start.sh
deleted file mode 100644
index 80ef63db3..000000000
--- a/docker/collectd/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/collectd" ]]; then
-    mkdir -p /var/log/kolla/collectd
-fi
-if [[ $(stat -c %a /var/log/kolla/collectd) != "755" ]]; then
-    chmod 755 /var/log/kolla/collectd
-fi