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>

7 files changed, 0 insertions, 122 deletions

diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
deleted file mode 100644
index be3e431e1..000000000
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block mistral_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set mistral_api_packages = [
-] %}
-{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
-RUN chmod 644 /usr/local/bin/kolla_mistral_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block mistral_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/mistral/mistral-api/extend_start.sh b/docker/mistral/mistral-api/extend_start.sh
deleted file mode 100644
index 113adb8a2..000000000
--- a/docker/mistral/mistral-api/extend_start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# 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
-    mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head
-    mistral-db-manage --config-file /etc/mistral/mistral.conf populate
-    exit 0
-fi
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
deleted file mode 100644
index 1d72c1cac..000000000
--- a/docker/mistral/mistral-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 mistral_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='mistral') }}
-
-ADD mistral-base-archive /mistral-base-source
-ADD plugins-archive /
-
-{% set mistral_base_pip_packages = [
-    '/mistral',
-    'redis'
-] %}
-
-{% set mistral_base_plugins_pip_packages = [
-    '/plugins/*'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s mistral-base-source/* mistral \
-    && {{ macros.install_pip(mistral_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/mistral \
-    && cp -r /mistral/etc/* /etc/mistral/ \
-    && if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(mistral_base_plugins_pip_packages) }}; \
-       fi \
-    && touch /usr/local/bin/kolla_mistral_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_mistral_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block mistral_base_footer %}{% endblock %}
diff --git a/docker/mistral/mistral-base/extend_start.sh b/docker/mistral/mistral-base/extend_start.sh
deleted file mode 100644
index ac2980d6c..000000000
--- a/docker/mistral/mistral-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/mistral" ]]; then
-    mkdir -p /var/log/kolla/mistral
-fi
-if [[ $(stat -c %a /var/log/kolla/mistral) != "755" ]]; then
-    chmod 755 /var/log/kolla/mistral
-fi
-
-. /usr/local/bin/kolla_mistral_extend_start
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2
deleted file mode 100644
index c5fd5eb0d..000000000
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block mistral_engine_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block mistral_engine_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER mistral
diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2
deleted file mode 100644
index 2a05ecf76..000000000
--- a/docker/mistral/mistral-event-engine/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block mistral_event_engine_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block mistral_event_engine_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER mistral
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2
deleted file mode 100644
index aeae9ed06..000000000
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block mistral_executor_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block mistral_executor_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER mistral