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>

5 files changed, 94 insertions, 0 deletions

diff --git a/kolla/docker/tacker/tacker-base/Dockerfile.j2 b/kolla/docker/tacker/tacker-base/Dockerfile.j2
new file mode 100644
index 000000000..c24c8d87c
--- /dev/null
+++ b/kolla/docker/tacker/tacker-base/Dockerfile.j2
@@ -0,0 +1,43 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block tacker_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='tacker') }}
+
+{% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
+{% endif %}
+
+ADD tacker-base-archive /tacker-base-source
+ADD plugins-archive /
+
+{% set tacker_base_pip_packages = [
+    '/tacker'
+] %}
+
+{% set tacker_base_plugins_pip_packages = [
+    '/plugins/*'
+] %}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN ln -s tacker-base-source/* tacker \
+    && {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \
+    && mkdir -p /etc/tacker \
+    && cp -r /tacker/etc/tacker/* /etc/tacker \
+    && if [ "$(ls /plugins)" ]; then \
+        {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \
+       fi \
+    && touch /usr/local/bin/kolla_tacker_extend_start \
+    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block tacker_base_footer %}{% endblock %}
diff --git a/kolla/docker/tacker/tacker-base/extend_start.sh b/kolla/docker/tacker/tacker-base/extend_start.sh
new file mode 100644
index 000000000..a3b7db8d3
--- /dev/null
+++ b/kolla/docker/tacker/tacker-base/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/tacker" ]]; then
+    mkdir -p /var/log/kolla/tacker
+fi
+if [[ $(stat -c %a /var/log/kolla/tacker) != "755" ]]; then
+    chmod 755 /var/log/kolla/tacker
+fi
+
+. /usr/local/bin/kolla_tacker_extend_start
diff --git a/kolla/docker/tacker/tacker-conductor/Dockerfile.j2 b/kolla/docker/tacker/tacker-conductor/Dockerfile.j2
new file mode 100644
index 000000000..676c90106
--- /dev/null
+++ b/kolla/docker/tacker/tacker-conductor/Dockerfile.j2
@@ -0,0 +1,15 @@
+FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block tacker_conductor_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.kolla_patch_sources() }}
+
+{% block tacker_conductor_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER tacker
diff --git a/kolla/docker/tacker/tacker-server/Dockerfile.j2 b/kolla/docker/tacker/tacker-server/Dockerfile.j2
new file mode 100644
index 000000000..659b70bea
--- /dev/null
+++ b/kolla/docker/tacker/tacker-server/Dockerfile.j2
@@ -0,0 +1,18 @@
+FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block tacker_server_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start
+RUN chmod 644 /usr/local/bin/kolla_tacker_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block tacker_server_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER tacker
diff --git a/kolla/docker/tacker/tacker-server/extend_start.sh b/kolla/docker/tacker/tacker-server/extend_start.sh
new file mode 100644
index 000000000..311d21f71
--- /dev/null
+++ b/kolla/docker/tacker/tacker-server/extend_start.sh
@@ -0,0 +1,8 @@
+#!/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
+    tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head
+    exit 0
+fi