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, 109 deletions

diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
deleted file mode 100644
index 8d2885b86..000000000
--- a/docker/trove/trove-api/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block trove_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_trove_extend_start
-RUN chmod 644 /usr/local/bin/kolla_trove_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block trove_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/trove/trove-api/extend_start.sh b/docker/trove/trove-api/extend_start.sh
deleted file mode 100644
index 76839e2d4..000000000
--- a/docker/trove/trove-api/extend_start.sh
+++ /dev/null
@@ -1,8 +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
-    trove-manage db_sync
-    exit 0
-fi
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
deleted file mode 100644
index a675b2b72..000000000
--- a/docker/trove/trove-base/Dockerfile.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block trove_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='trove') }}
-
-ADD trove-base-archive /trove-base-source
-
-{% set trove_base_pip_packages = [
-    '/trove'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s trove-base-source/* trove \
-    && {{ macros.install_pip(trove_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/trove \
-    && cp -r /trove/etc/trove/* /etc/trove/ \
-    && cp /var/lib/kolla/venv/etc/pycadf/trove_api_audit_map.conf /etc/trove/ \
-    && touch /usr/local/bin/kolla_trove_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block trove_base_footer %}{% endblock %}
diff --git a/docker/trove/trove-base/extend_start.sh b/docker/trove/trove-base/extend_start.sh
deleted file mode 100644
index 581a83d7b..000000000
--- a/docker/trove/trove-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/trove" ]]; then
-    mkdir -p /var/log/kolla/trove
-fi
-if [[ $(stat -c %a /var/log/kolla/trove) != "755" ]]; then
-    chmod 755 /var/log/kolla/trove
-fi
-
-. /usr/local/bin/kolla_trove_extend_start
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
deleted file mode 100644
index 4a038c7f9..000000000
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block trove_conductor_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block trove_conductor_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER trove
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
deleted file mode 100644
index 178260cae..000000000
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block trove_guestagent_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block trove_guestagent_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER trove
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
deleted file mode 100644
index cef0a0ce9..000000000
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block trove_taskmanager_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block trove_taskmanager_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER trove