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, 115 deletions

diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
deleted file mode 100644
index db3030c8d..000000000
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block heat_api_cfn_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block heat_api_cfn_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
deleted file mode 100644
index af2471279..000000000
--- a/docker/heat/heat-api/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block heat_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
-RUN chmod 644 /usr/local/bin/kolla_heat_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block heat_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh
deleted file mode 100644
index ddf4f81f4..000000000
--- a/docker/heat/heat-api/extend_start.sh
+++ /dev/null
@@ -1,17 +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
-    heat-manage db_sync
-
-    EXISTING_DOMAINS=$(openstack domain list -f value -c Name)
-
-    if ! echo "$EXISTING_DOMAINS" | grep '^heat_user_domain$' &>/dev/null; then
-        openstack domain create heat_user_domain
-        openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD}
-        openstack role add --domain heat_user_domain --user-domain heat_user_domain --user heat_domain_admin admin
-    fi
-
-    exit 0
-fi
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
deleted file mode 100644
index a06ea6f0d..000000000
--- a/docker/heat/heat-base/Dockerfile.j2
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block heat_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='heat') }}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['openvswitch']) }}
-
-{% endif %}
-
-{% set heat_base_packages = [
-] %}
-
-{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
-
-ADD heat-base-archive /heat-base-source
-
-{% set heat_base_pip_packages = [
-    '/heat'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s heat-base-source/* heat \
-    && {{ macros.install_pip(heat_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/heat \
-    && cp -r /heat/etc/heat/* /etc/heat/ \
-    && cp /var/lib/kolla/venv/etc/pycadf/heat_api_audit_map.conf /etc/heat/ \
-    && touch /usr/local/bin/kolla_heat_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block heat_base_footer %}{% endblock %}
diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh
deleted file mode 100644
index 1c1e86b8e..000000000
--- a/docker/heat/heat-base/extend_start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/heat" ]]; then
-    mkdir -p /var/log/kolla/heat
-fi
-if [[ $(stat -c %U:%G /var/log/kolla/heat) != "heat:kolla" ]]; then
-    chown -R heat:kolla /var/log/kolla/heat
-fi
-if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then
-    chmod 755 /var/log/kolla/heat
-fi
-
-. /usr/local/bin/kolla_heat_extend_start
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
deleted file mode 100644
index 86c943582..000000000
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block heat_engine_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block heat_engine_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER heat