Synchronise master with upstream#525
Merged
Alex-Welsh merged 16 commits intostackhpc/masterfrom Apr 7, 2026
Merged
Conversation
Closes-Bug: #2113874 Change-Id: I71003e0d454deaf75f8e2ad2080077a1118af12c
CentOS/Rocky 10 no longer supports DSA keys, causing haproxy-ssh to fail on startup with "unknown key type dsa". This aligns haproxy-ssh with the same fix already applied to keystone-ssh and nova-ssh. Closes-Bug: #2143880 Change-Id: I3990c2c67756378063e0867edcd004e8d28574dd Signed-off-by: Antony Messerli <antony@mes.ser.li>
This matches the version used by Ubuntu images since Flamingo [1][2]. Debian Trixie still uses 25.03 [3]. Support for 25.03 has ended on 7 March, 2026 [4] while 25.09 is supported until 5 September, 2026 [5]. [1] https://openstack-ci-reports.ubuntu.com/reports/cloud-archive/flamingo_versions.html [2] https://openstack-ci-reports.ubuntu.com/reports/cloud-archive/gazpacho_versions.html [3] https://packages.debian.org/source/trixie/ovn [4] https://www.ovn.org/en/releases/25.03/ [5] https://www.ovn.org/en/releases/25.09/ Change-Id: I323ea4e7dabecfcf20fa890e028eeb1c3766be0b Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
Change-Id: I530a0f710507c8f959ccf10e4d3560372e800a05 Signed-off-by: Seunghun Lee <seunghun@stackhpc.com>
This patch adds support for the standalone neutron-ovn-vpn-agent. The new agent was added in the 2024.1 and is required for vpnaas when using ovn. [1] https://review.opendev.org/c/openstack/neutron-vpnaas/+/765353 Related-Bug: #2048392 Change-Id: I552b9fbc8fa0b49d3e0e3212dd11962b02837b9f Signed-off-by: Joachim de Groot <joachim.de.groot@menzel-it.net> Signed-off-by: Pablo COLSON <colson.pablo@gmail.com> Signed-off-by: Piotr Milewski <vurmil@gmail.com>
Adds a new prometheus-valkey-exporter image to support monitoring of Valkey instances. Change-Id: Id0ad47301e48fc4e2cb1f93865a5c5d58f521467 Signed-off-by: Piotr Milewski <vurmil@gmail.com>
Currently, Kolla images lack standard metadata, making it difficult
to identify their build source, creation time, or exact version solely
by inspecting the image artifact.
This patch introduces the addition of Open Container Initiative (OCI)
standard labels to all generated images. The build process now detects
metadata (utilizing `direct_url.json` for pip-installed packages to
avoid subprocess calls) and injects the following labels into the
container runtime config:
* org.opencontainers.image.authors
* org.opencontainers.image.created
* org.opencontainers.image.description
* org.opencontainers.image.licenses
* org.opencontainers.image.revision
* org.opencontainers.image.source
* org.opencontainers.image.title
* org.opencontainers.image.url
* org.opencontainers.image.version
Example output:
"Labels": {
"org.opencontainers.image.authors": "Kolla Project (https://launchpad.net/kolla)",
"org.opencontainers.image.created": "2025-12-22T14:02:47.015819",
"org.opencontainers.image.description": "OpenStack Kolla keystone-ssh image",
"org.opencontainers.image.licenses": "Apache-2.0",
"org.opencontainers.image.revision": "96b54022857ccef8dc6bb11789abe32119827109",
"org.opencontainers.image.source": "https://opendev.org/openstack/kolla",
"org.opencontainers.image.title": "keystone-ssh",
"org.opencontainers.image.url": "https://opendev.org/openstack/kolla",
"org.opencontainers.image.version": "master-ubuntu-noble"
}
This enhancement improves the interoperability of Kolla images with
standard container tools and registries that display OCI metadata.
Change-Id: I3451940c90180ba91759c839987434e94251e32e
Signed-off-by: Piotr Milewski <vurmil@gmail.com>
Change-Id: I5041828f1cf7a143784f0ac479b6669e8a747b0c Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
github-actions
bot
added
automated
Alex-Welsh
approved these changes
Apr 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of master from upstream master.