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

diff --git a/docker/hacluster/hacluster-base/Dockerfile.j2 b/docker/hacluster/hacluster-base/Dockerfile.j2
deleted file mode 100644
index 045f21e1e..000000000
--- a/docker/hacluster/hacluster-base/Dockerfile.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block hacluster_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type =='rpm' %}
-
-{{ macros.enable_extra_repos(['hacluster']) }}
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block hacluster_base_footer %}{% endblock %}
diff --git a/docker/hacluster/hacluster-base/extend_start.sh b/docker/hacluster/hacluster-base/extend_start.sh
deleted file mode 100644
index c0e9301d0..000000000
--- a/docker/hacluster/hacluster-base/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/hacluster" ]]; then
-    mkdir -p /var/log/kolla/hacluster
-fi
-if [[ $(stat -c %a /var/log/kolla/hacluster) != "755" ]]; then
-    chmod 755 /var/log/kolla/hacluster
-fi
diff --git a/docker/hacluster/hacluster-corosync/Dockerfile.j2 b/docker/hacluster/hacluster-corosync/Dockerfile.j2
deleted file mode 100644
index 74d47c380..000000000
--- a/docker/hacluster/hacluster-corosync/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block hacluster_corosync_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set hacluster_corosync_packages = ['corosync'] %}
-{{ macros.install_packages(hacluster_corosync_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block hacluster_corosync_footer %}{% endblock %}
diff --git a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2
deleted file mode 100644
index 64c381e1f..000000000
--- a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block hacluster_pacemaker_remote_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set hacluster_pacemaker_remote_packages = ['pacemaker-remote'] %}
-{% if base_package_type == 'deb' %}
-    {% set hacluster_pacemaker_remote_packages = hacluster_pacemaker_remote_packages + [
-        'pacemaker-cli-utils'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(hacluster_pacemaker_remote_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block hacluster_pacemaker_remote_footer %}{% endblock %}
diff --git a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2
deleted file mode 100644
index 33eeb3144..000000000
--- a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block hacluster_pacemaker_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set hacluster_pacemaker_packages = ['pacemaker'] %}
-{% if base_package_type == 'deb' %}
-    {% set hacluster_pacemaker_packages = hacluster_pacemaker_packages + [
-        'pacemaker-cli-utils'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(hacluster_pacemaker_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block hacluster_pacemaker_footer %}{% endblock %}
diff --git a/docker/hacluster/hacluster-pcs/Dockerfile.j2 b/docker/hacluster/hacluster-pcs/Dockerfile.j2
deleted file mode 100644
index a146d0d4b..000000000
--- a/docker/hacluster/hacluster-pcs/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block hacluster_pcs_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set hacluster_pcs_packages = ['pcs','crmsh'] %}
-{{ macros.install_packages(hacluster_pcs_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block hacluster_pcs_footer %}{% endblock %}