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, 0 insertions, 110 deletions

diff --git a/docker/skyline/skyline-apiserver/Dockerfile.j2 b/docker/skyline/skyline-apiserver/Dockerfile.j2
deleted file mode 100644
index 85b40d51c..000000000
--- a/docker/skyline/skyline-apiserver/Dockerfile.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}skyline-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block skyline_apiserver_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-ADD skyline-apiserver-archive /skyline-apiserver-source
-
-{% set skyline_apiserver_pip_packages = [
-    '/skyline-apiserver'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_skyline_extend_start
-
-RUN ln -s skyline-apiserver-source/* skyline-apiserver \
-    && {{ macros.install_pip(skyline_apiserver_pip_packages | customizable("pip_packages")) }} \
-    && chmod 644 /usr/local/bin/kolla_skyline_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block skyline_apiserver_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER skyline
diff --git a/docker/skyline/skyline-apiserver/extend_start.sh b/docker/skyline/skyline-apiserver/extend_start.sh
deleted file mode 100644
index e1802937b..000000000
--- a/docker/skyline/skyline-apiserver/extend_start.sh
+++ /dev/null
@@ -1,11 +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
-    SITE_PACKAGES="/var/lib/kolla/venv/lib/python3/site-packages"
-    pushd ${SITE_PACKAGES}/skyline_apiserver/db/alembic
-    alembic upgrade head
-    popd
-    exit 0
-fi
diff --git a/docker/skyline/skyline-base/Dockerfile.j2 b/docker/skyline/skyline-base/Dockerfile.j2
deleted file mode 100644
index 815fa504f..000000000
--- a/docker/skyline/skyline-base/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block skyline_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='skyline') }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_skyline_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_skyline_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block skyline_base_footer %}{% endblock %}
diff --git a/docker/skyline/skyline-base/extend_start.sh b/docker/skyline/skyline-base/extend_start.sh
deleted file mode 100644
index 34362ad04..000000000
--- a/docker/skyline/skyline-base/extend_start.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/skyline" ]]; then
-    mkdir -p /var/log/kolla/skyline
-fi
-if [[ $(stat -c %U:%G /var/log/kolla/skyline) != "skyline:kolla" ]]; then
-    chown skyline:kolla /var/log/kolla/skyline
-fi
-if [[ $(stat -c %a /var/log/kolla/skyline) != "755" ]]; then
-    chmod 755 /var/log/kolla/skyline
-fi
-
-if [[ ! -d "/var/lib/skyline" ]]; then
-    mkdir -p /var/lib/skyline
-fi
-if [[ $(stat -c %U:%G /var/lib/skyline) != "skyline:kolla" ]]; then
-    chown skyline:kolla /var/lib/skyline
-fi
-if [[ $(stat -c %a /var/lib/skyline) != "755" ]]; then
-    chmod 755 /var/lib/skyline
-fi
-
-. /usr/local/bin/kolla_skyline_extend_start
diff --git a/docker/skyline/skyline-console/Dockerfile.j2 b/docker/skyline/skyline-console/Dockerfile.j2
deleted file mode 100644
index ba62f5041..000000000
--- a/docker/skyline/skyline-console/Dockerfile.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}skyline-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block skyline_console_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set skyline_console_packages = [
-    'nginx'
-] %}
-
-{{ macros.install_packages(skyline_console_packages | customizable("packages")) }}
-
-ADD skyline-console-archive /skyline-console-source
-
-{% set skyline_console_pip_packages = [
-    '/skyline-console'
-] %}
-
-RUN ln -s skyline-console-source/* skyline-console \
-    && {{ macros.install_pip(skyline_console_pip_packages | customizable("pip_packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block skyline_console_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER root