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>

6 files changed, 0 insertions, 95 deletions

diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2
deleted file mode 100644
index f31b53ecf..000000000
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block watcher_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start
-RUN chmod 644 /usr/local/bin/kolla_watcher_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block watcher_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER watcher
diff --git a/docker/watcher/watcher-api/extend_start.sh b/docker/watcher/watcher-api/extend_start.sh
deleted file mode 100644
index 629ea6355..000000000
--- a/docker/watcher/watcher-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
-    watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade
-    exit 0
-fi
diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2
deleted file mode 100644
index db28d81d9..000000000
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block watcher_applier_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block watcher_applier_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER watcher
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
deleted file mode 100644
index 8de6ceb9d..000000000
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block watcher_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='watcher') }}
-
-ADD watcher-base-archive /watcher-base-source
-
-{% set watcher_base_pip_packages = [
-    '/watcher'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s watcher-base-source/* watcher \
-    && {{ macros.install_pip(watcher_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/watcher \
-    && cp -r /watcher/etc/watcher/* /etc/watcher/ \
-    && touch /usr/local/bin/kolla_watcher_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block watcher_base_footer %}{% endblock %}
diff --git a/docker/watcher/watcher-base/extend_start.sh b/docker/watcher/watcher-base/extend_start.sh
deleted file mode 100644
index 9e27a9cf0..000000000
--- a/docker/watcher/watcher-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/watcher" ]]; then
-    mkdir -p /var/log/kolla/watcher
-fi
-if [[ $(stat -c %a /var/log/kolla/watcher) != "755" ]]; then
-    chmod 755 /var/log/kolla/watcher
-fi
-
-. /usr/local/bin/kolla_watcher_extend_start
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2
deleted file mode 100644
index 2518a92b6..000000000
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block watcher_engine_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block watcher_engine_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER watcher