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

diff --git a/docker/valkey/valkey-base/Dockerfile.j2 b/docker/valkey/valkey-base/Dockerfile.j2
deleted file mode 100644
index bc17c0cbb..000000000
--- a/docker/valkey/valkey-base/Dockerfile.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block valkey_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='valkey', homedir='/run/valkey') }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block valkey_base_footer %}{% endblock %}
diff --git a/docker/valkey/valkey-base/extend_start.sh b/docker/valkey/valkey-base/extend_start.sh
deleted file mode 100644
index 3a3a321d4..000000000
--- a/docker/valkey/valkey-base/extend_start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/valkey" ]]; then
-    mkdir -p /var/log/kolla/valkey
-fi
-
-if [[ $(stat -c %a /var/log/kolla/valkey) != "755" ]]; then
-    chmod 755 /var/log/kolla/valkey
-fi
diff --git a/docker/valkey/valkey-sentinel/Dockerfile.j2 b/docker/valkey/valkey-sentinel/Dockerfile.j2
deleted file mode 100644
index 94828a38f..000000000
--- a/docker/valkey/valkey-sentinel/Dockerfile.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}valkey-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block valkey_sentinel_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-{{ macros.enable_extra_repos(['epel']) }}
-    {% set valkey_sentinel_packages = ['valkey'] %}
-{% elif base_package_type == 'deb' %}
-    {% set valkey_sentinel_packages = ['valkey-sentinel'] %}
-{% endif %}
-{{ macros.install_packages(valkey_sentinel_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block valkey_sentinel_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER valkey
diff --git a/docker/valkey/valkey-sentinel/extend_start.sh b/docker/valkey/valkey-sentinel/extend_start.sh
deleted file mode 100644
index e6af42ef6..000000000
--- a/docker/valkey/valkey-sentinel/extend_start.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/valkey" ]]; then
-    mkdir -p /var/log/kolla/valkey
-fi
-
-if [[ $(stat -c %a /var/log/kolla/valkey) != "755" ]]; then
-    chmod 755 /var/log/kolla/valkey
-fi
-
-# The CONFIG REWRITE command rewrites the valkey.conf
-# file the server was started with, applying the minimal
-# changes needed to make it reflect the configuration
-# currently used by the server, which may be different
-# compared to the original one because of the use of
-# the CONFIG SET command.
-#
-# https://valkey.io/commands/config-rewrite/
-#
-# Because of above behaviour it's needed to
-# hack kolla's CMD.
-#
-# Without this hack
-# /usr/local/bin/kolla_set_configs --check
-# is always reporting changed.
-#
-# Therefore valkey-sentinel is always restarted
-# even if configuration is not changed from
-# kolla-ansible side.
-if [ ! -z "${VALKEY_CONF}" ] && [ ! -z ${VALKEY_GEN_CONF} ]; then
-    cp ${VALKEY_CONF} ${VALKEY_GEN_CONF}
-fi
diff --git a/docker/valkey/valkey-server/Dockerfile.j2 b/docker/valkey/valkey-server/Dockerfile.j2
deleted file mode 100644
index be157d89e..000000000
--- a/docker/valkey/valkey-server/Dockerfile.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}valkey-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block valkey_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-{{ macros.enable_extra_repos(['epel']) }}
-{% endif %}
-
-{% set valkey_server_packages = ['valkey'] %}
-
-{{ macros.install_packages(valkey_server_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block valkey_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER valkey