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-base/ovs_wrapper.sh | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 docker/openvswitch/openvswitch-base/ovs_wrapper.sh (limited to 'docker/openvswitch/openvswitch-base/ovs_wrapper.sh') diff --git a/docker/openvswitch/openvswitch-base/ovs_wrapper.sh b/docker/openvswitch/openvswitch-base/ovs_wrapper.sh deleted file mode 100644 index 552c496ac..000000000 --- a/docker/openvswitch/openvswitch-base/ovs_wrapper.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -catch_term() { - ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit - exit 0 -} - -catch_quit() { - ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit - exit 0 -} - -trap catch_term SIGTERM -trap catch_quit SIGQUIT - -"$@" & - -child=$! -wait "$child" -- cgit v1.2.3