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>
---
 .../openvswitch/openvswitch-db-server/Dockerfile.j2      | 16 ++++++++++++++++
 .../openvswitch/openvswitch-db-server/extend_start.sh    | 15 +++++++++++++++
 .../drop-ovs-ensure-configured-7973d36969e157fa.yaml     |  5 +++++
 3 files changed, 36 insertions(+)
 create mode 100644 kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
 create mode 100644 kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh
 create mode 100644 kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml

(limited to 'kolla/docker/openvswitch/openvswitch-db-server')

diff --git a/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
new file mode 100644
index 000000000..869dbabb6
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block openvswitch_db_server_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
+RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block openvswitch_db_server_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh
new file mode 100644
index 000000000..d25038bdd
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+mkdir -p "/run/openvswitch"
+if [[ ! -e "/var/lib/openvswitch/conf.db" ]]; then
+    ovsdb-tool create "/var/lib/openvswitch/conf.db"
+fi
+
+if [[ $(ovsdb-tool needs-conversion /var/lib/openvswitch/conf.db) == yes ]]; then
+    ovsdb-tool convert "/var/lib/openvswitch/conf.db"
+fi
+
+if [[ ! -r "/var/log/kolla/openvswitch/ovsdb-server.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovsdb-server.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovsdb-server.log
+fi
diff --git a/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml b/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml
new file mode 100644
index 000000000..cc8daf1f4
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    ``openvswitch`` script ``ovs_ensure_configured.sh`` has been dropped after
+    being replaced with Ansible modules in ``kolla-ansible``.
-- 
cgit v1.2.3