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>

5 files changed, 0 insertions, 64 deletions

diff --git a/docker/kerbside/kerbside-api/Dockerfile.j2 b/docker/kerbside/kerbside-api/Dockerfile.j2
deleted file mode 100644
index 6ea99eb7a..000000000
--- a/docker/kerbside/kerbside-api/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kerbside-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-USER kerbside
diff --git a/docker/kerbside/kerbside-api/extend_start.sh b/docker/kerbside/kerbside-api/extend_start.sh
deleted file mode 100644
index 92ef80a22..000000000
--- a/docker/kerbside/kerbside-api/extend_start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Make the log directory
-mkdir -p /var/log/kolla/kerbside
diff --git a/docker/kerbside/kerbside-base/Dockerfile.j2 b/docker/kerbside/kerbside-base/Dockerfile.j2
deleted file mode 100644
index 77f881399..000000000
--- a/docker/kerbside/kerbside-base/Dockerfile.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block kerbside_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='kerbside', groups='kerbside') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set kerbside_packages = [
-        'mariadb-devel',
-        'pkgconfig'
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set kerbside_packages = [
-        'libmariadb-dev-compat',
-        'pkg-config'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(kerbside_packages | customizable("packages")) }}
-
-{% set kerbside_pip_packages = [
-    '/kerbside'
-] %}
-
-ADD kerbside-base-archive /kerbside-source
-RUN ln -s kerbside-source/* kerbside \
-    && if [ "$(ls /plugins)" ]; then \
-           {{ macros.install_pip(kerbside_plugins_pip_packages) }}; \
-       fi \
-    && {{ macros.install_pip(kerbside_pip_packages | customizable("pip_packages"), false) }} \
-    && rm -f /etc/machine-id
-
-{% block kerbside_base_footer %}{% endblock %}
diff --git a/docker/kerbside/kerbside-proxy/Dockerfile.j2 b/docker/kerbside/kerbside-proxy/Dockerfile.j2
deleted file mode 100644
index 6ea99eb7a..000000000
--- a/docker/kerbside/kerbside-proxy/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kerbside-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-USER kerbside
diff --git a/docker/kerbside/kerbside-proxy/extend_start.sh b/docker/kerbside/kerbside-proxy/extend_start.sh
deleted file mode 100644
index 92ef80a22..000000000
--- a/docker/kerbside/kerbside-proxy/extend_start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Make the log directory
-mkdir -p /var/log/kolla/kerbside