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>

11 files changed, 0 insertions, 193 deletions

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
deleted file mode 100644
index 6ca9ac180..000000000
--- a/docker/designate/designate-api/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER designate
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
deleted file mode 100644
index cf1277aeb..000000000
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_backend_bind9_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-   {% set designate_backend_bind9_packages = ['bind'] %}
-
-{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
-
-{% elif base_package_type == 'deb' %}
-   {% set designate_backend_bind9_packages = ['bind9'] %}
-
-{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
-
-{% endif %}
-
-{% set designate_backend_bind_name = 'bind' if base_package_type == 'deb' else 'named' %}
-
-RUN mkdir -p /var/lib/kolla/ /var/lib/{{ designate_backend_bind_name }}/ /run/{{ designate_backend_bind_name }} \
-     && chown -R root: /var/lib/{{ designate_backend_bind_name }} /run/{{ designate_backend_bind_name }} \
-     && chmod 755 /run/{{ designate_backend_bind_name }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_backend_bind9_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
deleted file mode 100644
index 26a0beca1..000000000
--- a/docker/designate/designate-base/Dockerfile.j2
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='designate') }}
-
-{% set designate_base_pip_packages = [
-    '/designate'
-] %}
-
-ADD designate-base-archive /designate-base-source
-
-COPY designate_sudoers /etc/sudoers.d/kolla_designate_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s designate-base-source/* designate \
-    && {{ macros.install_pip(designate_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/designate \
-    && cp -r /designate/etc/designate/* /etc/designate/ \
-    && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/designate/rootwrap.conf \
-    && chmod 750 /etc/sudoers.d \
-    && chmod 640 /etc/sudoers.d/kolla_designate_sudoers \
-    && touch /usr/local/bin/kolla_designate_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_designate_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_base_footer %}{% endblock %}
diff --git a/docker/designate/designate-base/designate_sudoers b/docker/designate/designate-base/designate_sudoers
deleted file mode 100644
index d06679fe2..000000000
--- a/docker/designate/designate-base/designate_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/designate-rootwrap /etc/designate/rootwrap.conf *
diff --git a/docker/designate/designate-base/extend_start.sh b/docker/designate/designate-base/extend_start.sh
deleted file mode 100644
index 66b376c30..000000000
--- a/docker/designate/designate-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/designate" ]]; then
-    mkdir -p /var/log/kolla/designate
-fi
-if [[ $(stat -c %a /var/log/kolla/designate) != "755" ]]; then
-    chmod 755 /var/log/kolla/designate
-fi
-
-. /usr/local/bin/kolla_designate_extend_start
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
deleted file mode 100644
index 81c3c901f..000000000
--- a/docker/designate/designate-central/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_central_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_designate_extend_start
-RUN chmod 644 /usr/local/bin/kolla_designate_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_central_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER designate
diff --git a/docker/designate/designate-central/extend_start.sh b/docker/designate/designate-central/extend_start.sh
deleted file mode 100644
index 8e90f55fc..000000000
--- a/docker/designate/designate-central/extend_start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ ! -f "/var/log/kolla/designate/designate-manage.log" ]]; then
-    touch /var/log/kolla/designate/designate-manage.log
-    chmod 644 /var/log/kolla/designate/designate-manage.log
-fi
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    designate-manage database sync
-    exit 0
-fi
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
deleted file mode 100644
index dd2e6df75..000000000
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_mdns_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_mdns_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER designate
diff --git a/docker/designate/designate-producer/Dockerfile.j2 b/docker/designate/designate-producer/Dockerfile.j2
deleted file mode 100644
index bd1ce4e1d..000000000
--- a/docker/designate/designate-producer/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_producer_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_producer_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER designate
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
deleted file mode 100644
index 8b8e50adf..000000000
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_sink_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_sink_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER designate
diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2
deleted file mode 100644
index b4e190df6..000000000
--- a/docker/designate/designate-worker/Dockerfile.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block designate_worker_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-# The bind9 package here is only to provide the rndc binary.
-{% if base_package_type == 'rpm' %}
-    {% set designate_worker_packages = [
-        'bind'
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set designate_worker_packages = [
-        'bind9'
-    ] %}
-{% endif %}
-{{ macros.install_packages(designate_worker_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block designate_worker_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER designate