openstack/kolla.git/kolla/docker/ovn/ovn-controller/Dockerfile.j2, branch master

Ensure openvswitch-base children get ovs repo

2026-08-27T09:38:19+00:00

Previously, openvswitch-base would enable the openvswitch repo, and child containers (e.g. ovn-base, ovn-controller, etc) would be built using ovn packages from that repo. Recently [1] builds were changed to clean up repos at the end of the build, so now dependent containers must re-enable the repo manually. Also added an openvswitch repo override to tests to avoid regresssion. [1] Ie5b9970a4575b6258dc238059d3f33ddfe155789 Closes-Bug: #2163314 Change-Id: I4ea1cc812167142743e3ebcbd532281bfe8a9799 Signed-off-by: Alex Welsh

Add cleanup_repos to revert build_only overrides

2026-08-05T08:13:09+00:00

Repos marked build_only: true are backed up before handle_repos() overwrites them and restored at the end of each image build, so CI mirror URLs are not baked into the final image. The cleanup RUN was injected into every Dockerfile, not just images that called handle_repos() for those repos. Child images with no backup fell through to "rm -f", deleting the inherited repo file (e.g. debian.sources in bifrost-base, breaking cpio install). Fix by adding a {repo}.enabled sentinel that handle_repos creates when it processes a build_only repo, making the cleanup conditional on that sentinel. Change-Id: Ie5b9970a4575b6258dc238059d3f33ddfe155789 Signed-off-by: Michal Nasiadka

Migrate to pyproject.toml

2026-07-06T19:59:40+00:00

[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