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>

3 files changed, 76 insertions, 0 deletions

diff --git a/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2
new file mode 100644
index 000000000..44d8df41c
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2
@@ -0,0 +1,45 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block openvswitch_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% block ovs_install %}
+
+{% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
+    {% set openvswitch_base_packages = [
+        'libibverbs',
+        'openvswitch${KOLLA_RPM_OVS_VERSION}',
+        'python3-openvswitch${KOLLA_RPM_OVS_VERSION}',
+        'tcpdump'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set openvswitch_base_packages = [
+        'openvswitch-switch',
+        'python3-openvswitch',
+        'tcpdump'
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }}
+
+{% endblock %}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+COPY ovs_wrapper.sh /usr/local/bin/ovs_wrapper
+
+# NOTE(hrw): Upstream moved tcpdump to /usr/bin/ in 4.99 version (used in Debian)
+RUN if [ -e /usr/sbin/tcpdump ]; then mv /usr/sbin/tcpdump /usr/bin/tcpdump; fi \
+    && touch /usr/local/bin/kolla_openvswitch_extend_start \
+    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start \
+    && chmod 755 /usr/local/bin/ovs_wrapper
+
+{{ macros.kolla_patch_sources() }}
+
+{% block openvswitch_base_footer %}{% endblock %}
diff --git a/kolla/docker/openvswitch/openvswitch-base/extend_start.sh b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh
new file mode 100644
index 000000000..1b0ed1300
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/openvswitch" ]]; then
+    mkdir -p /var/log/kolla/openvswitch
+fi
+if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then
+    chmod 755 /var/log/kolla/openvswitch
+fi
+
+chown -R openvswitch:openvswitch /var/log/kolla/openvswitch
+
+. /usr/local/bin/kolla_openvswitch_extend_start
diff --git a/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh b/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh
new file mode 100644
index 000000000..552c496ac
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+catch_term() {
+    ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit
+    exit 0
+}
+
+catch_quit() {
+    ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit
+    exit 0
+}
+
+trap catch_term SIGTERM
+trap catch_quit SIGQUIT
+
+"$@" &
+
+child=$!
+wait "$child"