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>

2 files changed, 0 insertions, 50 deletions

diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
deleted file mode 100644
index 57846af79..000000000
--- a/docker/nova/nova-api/Dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block nova_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set nova_api_packages = [
-] %}
-{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
-RUN chmod 644 /usr/local/bin/kolla_nova_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block nova_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh
deleted file mode 100644
index ead6c252b..000000000
--- a/docker/nova/nova-api/extend_start.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# TODO(dszumski): When Nova Conductor in Kolla Ansible supports triggering DB
-# operations, we should review this script and remove any duplicate
-# operations. This is probably anything that isn't to do with the API.
-
-# 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
-    nova-manage api_db sync
-    nova-manage db sync --local_cell
-    nova-manage db online_data_migrations
-    exit 0
-fi
-
-if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
-    nova-manage api_db sync
-    nova-manage db sync --local_cell
-    exit 0
-fi
-
-if [[ "${!KOLLA_OSM[@]}" ]]; then
-    nova-manage db online_data_migrations
-    exit 0
-fi
-
-if [[ "${!KOLLA_UPGRADE_CHECK[@]}" ]]; then
-    nova-status upgrade check
-    exit $?
-fi