From db35ac8d793506bc43b62e7e39d27a75de1043ed Mon Sep 17 00:00:00 2001 From: Michal Nasiadka 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 --- docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 16 ---------------- docker/openvswitch/openvswitch-db-server/extend_start.sh | 15 --------------- .../drop-ovs-ensure-configured-7973d36969e157fa.yaml | 5 ----- 3 files changed, 36 deletions(-) delete mode 100644 docker/openvswitch/openvswitch-db-server/Dockerfile.j2 delete mode 100644 docker/openvswitch/openvswitch-db-server/extend_start.sh delete mode 100644 docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml (limited to 'docker/openvswitch/openvswitch-db-server') diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 deleted file mode 100644 index 869dbabb6..000000000 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -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/docker/openvswitch/openvswitch-db-server/extend_start.sh b/docker/openvswitch/openvswitch-db-server/extend_start.sh deleted file mode 100644 index d25038bdd..000000000 --- a/docker/openvswitch/openvswitch-db-server/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/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/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml b/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml deleted file mode 100644 index cc8daf1f4..000000000 --- a/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -upgrade: - - | - ``openvswitch`` script ``ovs_ensure_configured.sh`` has been dropped after - being replaced with Ansible modules in ``kolla-ansible``. -- cgit v1.2.3