Synchronise 2025.1 with upstream#852
Merged
Alex-Welsh merged 8 commits intostackhpc/2025.1from Mar 9, 2026
Merged
Conversation
The loadbalancer role used haproxy_external_single_frontend_public_port (hardcoded to 443) instead of haproxy_single_external_frontend_public_port (smart default based on TLS setting). This broke HTTP-only deployments where services expected port 80 but haproxy bound to port 443. Closes-bug: #2133456 Change-Id: I128f7cab52818d369ee7d3252d81383cf49eca97 Signed-off-by: Bertrand Lanson <bertrand.lanson@protonmail.com> (cherry picked from commit bb4feef)
Change-Id: I5cf2fbd0bb4812b212a6bf05c4d4a2dd992a6cfe Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com> (cherry picked from commit 7b695b5)
Due to dynamic nature of blackbox exporters list in prometheus.yml generation of that config file was never idempotent. Let's sort it in the end - so it doesn't cause restart every deploy. Closes-Bug: #2142870 Change-Id: Ie45e61af3c88208498316a63a97cf5d4ce67b3be Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com> (cherry picked from commit 64d2b1d)
setuptools 82 removed pkg_resources, breaking stable/2025.1 jobs. Use a temporary stable-only pin to setuptools==81.0.0. detail reasoning in [1]. [1] https://review.opendev.org/c/openstack/requirements/+/976227 Depends-On: https://review.opendev.org/c/openstack/kolla/+/978553 Change-Id: I7119738be89d0172aaf741551ca8fb049d046ba7 Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Disabling requirements check because we need to pin bcrypt to a version lower than 5.0.0, due to passlib and bcrypt incompatibility, and since passlib is basically dead - there's no way to fix that in any other way for stable branches. Related issue: ansible/ansible#85919 Closes-Bug: #2126975 Closes-Bug: #2102117 Signed-off-by: Christian Berendt <berendt@osism.tech> Signed-off-by: Joachim de Groot <joacihm.de.groot@menzel-it.net> Change-Id: I47eee02a47104d3411992f7e6e9dd8f0c2ad0919 (cherry picked from commit fdc5740)
github-actions
bot
added
automated
github-actions
bot
added
automated
Alex-Welsh
approved these changes
Mar 9, 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
5 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 2025.1 from upstream stable/2025.1.