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>

4 files changed, 0 insertions, 99 deletions

diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2
deleted file mode 100644
index a13f65bdf..000000000
--- a/docker/placement/placement-api/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}placement-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block placement_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set placement_api_packages = [
-] %}
-{{ macros.install_packages(placement_api_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_placement_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block placement_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/placement/placement-api/extend_start.sh b/docker/placement/placement-api/extend_start.sh
deleted file mode 100644
index e468cbcaf..000000000
--- a/docker/placement/placement-api/extend_start.sh
+++ /dev/null
@@ -1,21 +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
-    placement-manage db sync
-    placement-manage db online_data_migrations
-    exit 0
-fi
-
-# DB synchronisation. To be executed prior to upgrading services.
-if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
-    placement-manage db sync
-    exit 0
-fi
-
-# Online data migrations. To be executed after upgrading services.
-if [[ "${!KOLLA_OSM[@]}" ]]; then
-    placement-manage db online_data_migrations
-    exit 0
-fi
diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2
deleted file mode 100644
index 6454da748..000000000
--- a/docker/placement/placement-base/Dockerfile.j2
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block placement_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='placement') }}
-
-{% if base_package_type == 'rpm' %}
-
-    {% set placement_base_packages = [
-    ] %}
-
-{% elif base_package_type == 'deb' %}
-
-    {% set placement_base_packages = [
-    ] %}
-
-{% endif %}
-
-{{ macros.install_packages(placement_base_packages | customizable("packages")) }}
-
-ADD placement-base-archive /placement-base-source
-ADD plugins-archive /
-
-{% set placement_base_pip_packages = [
-    '/placement'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s placement-base-source/* placement \
-    && {{ macros.install_pip(placement_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/placement/ \
-    && cp -r /placement/etc/placement/* /etc/placement/ \
-    && touch /usr/local/bin/kolla_placement_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_placement_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block placement_base_footer %}{% endblock %}
diff --git a/docker/placement/placement-base/extend_start.sh b/docker/placement/placement-base/extend_start.sh
deleted file mode 100644
index 900ea8447..000000000
--- a/docker/placement/placement-base/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/placement" ]]; then
-    mkdir -p /var/log/kolla/placement
-    touch /var/log/kolla/placement/placement-api.log
-fi
-if [[ $(stat -c %U:%G /var/log/kolla/placement) != "placement:kolla" ]]; then
-    chown -R placement:kolla /var/log/kolla/placement
-fi
-if [[ $(stat -c %a /var/log/kolla/placement) != "755" ]]; then
-    chmod 755 /var/log/kolla/placement
-    chmod 644 /var/log/kolla/placement/placement-api.log
-fi
-
-. /usr/local/bin/kolla_placement_extend_start