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/etcd/Dockerfile.j2   | 31 -------------------------------
 docker/etcd/etcd_sudoers    |  1 -
 docker/etcd/extend_start.sh | 13 -------------
 3 files changed, 45 deletions(-)
 delete mode 100644 docker/etcd/Dockerfile.j2
 delete mode 100644 docker/etcd/etcd_sudoers
 delete mode 100644 docker/etcd/extend_start.sh

(limited to 'docker/etcd')

diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2
deleted file mode 100644
index aafcd8666..000000000
--- a/docker/etcd/Dockerfile.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block etcd_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='etcd') }}
-
-{% block etcd_install %}
-ADD etcd-archive /etcd-source
-
-RUN ln -s etcd-source/* etcd \
-    && cp /etcd/etcd /etcd/etcdctl /usr/bin
-{% endblock %}
-
-COPY etcd_sudoers /etc/sudoers.d/kolla_etcd_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 644 /usr/local/bin/kolla_extend_start \
-    && chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/kolla_etcd_sudoers
-
-{{ macros.kolla_patch_sources() }}
-
-{% block etcd_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER etcd
diff --git a/docker/etcd/etcd_sudoers b/docker/etcd/etcd_sudoers
deleted file mode 100644
index d3e244be0..000000000
--- a/docker/etcd/etcd_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /usr/bin/chown etcd\: /var/lib/etcd/, /bin/chown etcd\: /var/lib/etcd/
diff --git a/docker/etcd/extend_start.sh b/docker/etcd/extend_start.sh
deleted file mode 100644
index c54023299..000000000
--- a/docker/etcd/extend_start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Create log directory, with appropriate permissions
-if [[ ! -d "/var/log/kolla/etcd" ]]; then
-    mkdir -p /var/log/kolla/etcd
-fi
-if [[ $(stat -c %a /var/log/kolla/etcd) != "755" ]]; then
-    chmod 755 /var/log/kolla/etcd
-fi
-
-if [[ $(stat -c %U /var/lib/etcd/) != "etcd" ]]; then
-    sudo chown etcd: /var/lib/etcd/
-fi
-- 
cgit v1.2.3