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>

1 files changed, 0 insertions, 42 deletions

diff --git a/docker/httpd/Dockerfile.j2 b/docker/httpd/Dockerfile.j2
deleted file mode 100644
index ec5637283..000000000
--- a/docker/httpd/Dockerfile.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block apache_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-{{ macros.enable_extra_repos(['epel']) }}
-    {% set apache_packages = [
-        'httpd',
-        'mod_ssl',
-        'mod_auth_mellon',
-        'mod_auth_openidc',
-        'mod_proxy_uwsgi'
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set apache_packages = [
-        'apache2',
-        'ca-certificates',
-        'libapache2-mod-auth-mellon',
-        'libapache2-mod-auth-openidc'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(apache_packages | customizable("packages")) }}
-
-{% if base_package_type == 'rpm' %}
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-{% elif base_package_type == 'deb' %}
-RUN echo > /etc/apache2/ports.conf
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup
-RUN chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_httpd_setup
-USER root
-
-{% block apache_footer %}{% endblock %}