From db35ac8d793506bc43b62e7e39d27a75de1043ed Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 6 Jul 2026 15:26:00 +0200
Subject: 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>
---
 docker/cloudkitty/cloudkitty-api/Dockerfile.j2     | 21 ----------------
 docker/cloudkitty/cloudkitty-api/extend_start.sh   |  9 -------
 docker/cloudkitty/cloudkitty-base/Dockerfile.j2    | 29 ----------------------
 docker/cloudkitty/cloudkitty-base/extend_start.sh  | 10 --------
 .../cloudkitty/cloudkitty-processor/Dockerfile.j2  | 20 ---------------
 5 files changed, 89 deletions(-)
 delete mode 100644 docker/cloudkitty/cloudkitty-api/Dockerfile.j2
 delete mode 100644 docker/cloudkitty/cloudkitty-api/extend_start.sh
 delete mode 100644 docker/cloudkitty/cloudkitty-base/Dockerfile.j2
 delete mode 100644 docker/cloudkitty/cloudkitty-base/extend_start.sh
 delete mode 100644 docker/cloudkitty/cloudkitty-processor/Dockerfile.j2

(limited to 'docker/cloudkitty')

diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
deleted file mode 100644
index fd3d124f3..000000000
--- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cloudkitty_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set cloudkitty_api_packages = [
-] %}
-
-{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start
-RUN chmod 644 /usr/local/bin/kolla_cloudkitty_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cloudkitty_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh
deleted file mode 100644
index 26d4a8c36..000000000
--- a/docker/cloudkitty/cloudkitty-api/extend_start.sh
+++ /dev/null
@@ -1,9 +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
-    cloudkitty-dbsync upgrade
-    cloudkitty-storage-init
-    exit 0
-fi
diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
deleted file mode 100644
index b545d4adf..000000000
--- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cloudkitty_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='cloudkitty') }}
-
-{% set cloudkitty_base_pip_packages = [
-    '/cloudkitty'
-] %}
-
-ADD cloudkitty-base-archive /cloudkitty-base-source
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s cloudkitty-base-source/* cloudkitty \
-    && {{ macros.install_pip(cloudkitty_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/cloudkitty  \
-    && cp -r /cloudkitty/etc/cloudkitty/* /etc/cloudkitty/ \
-    && touch /usr/local/bin/kolla_cloudkitty_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cloudkitty_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cloudkitty_base_footer %}{% endblock %}
diff --git a/docker/cloudkitty/cloudkitty-base/extend_start.sh b/docker/cloudkitty/cloudkitty-base/extend_start.sh
deleted file mode 100644
index cf49f9caf..000000000
--- a/docker/cloudkitty/cloudkitty-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/cloudkitty" ]]; then
-    mkdir -p /var/log/kolla/cloudkitty
-fi
-if [[ $(stat -c %a /var/log/kolla/cloudkitty) != "755" ]]; then
-    chmod 755 /var/log/kolla/cloudkitty
-fi
-
-. /usr/local/bin/kolla_cloudkitty_extend_start
diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
deleted file mode 100644
index 33f30fd33..000000000
--- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block cloudkitty_processor_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set cloudkitty_processor_packages = [
-] %}
-
-{{ macros.install_packages(cloudkitty_processor_packages | customizable("packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block cloudkitty_processor_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER cloudkitty
-- 
cgit v1.2.3