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/haproxy/haproxy-ssh/Dockerfile.j2 b/docker/haproxy/haproxy-ssh/Dockerfile.j2
deleted file mode 100644
index a674cc75e..000000000
--- a/docker/haproxy/haproxy-ssh/Dockerfile.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block haproxy_ssh_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='haproxy', shell='/bin/bash') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set haproxy_ssh_packages = [
-        'openssh-server',
-        'openssh-clients',
-        'rsync',
-    ] %}
-
-{% elif base_package_type == 'deb' %}
-    {% set haproxy_ssh_packages = [
-        'openssh-server',
-        'openssh-client',
-        'rsync',
-    ] %}
-
-RUN mkdir -p /var/run/sshd \
-    && chmod 0755 /var/run/sshd
-
-{% endif %}
-
-{{ macros.install_packages(haproxy_ssh_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start \
-    && sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd
-
-COPY update-loadbalancer-cert.sh /usr/bin/update-loadbalancer-cert
-
-{{ macros.kolla_patch_sources() }}
-
-{% block haproxy_ssh_footer %}{% endblock %}
-{% block footer %}{% endblock %}