Synchronise 2025.1 with upstream - #936
Merged
Merged
Conversation
It seems due to new pbr and old pip we're seeing issues related to pbr being unable to import tomli (to scan pyproject.toml). Needed-by: https://review.opendev.org/c/openstack/kolla/+/1002078 Change-Id: Ida5906f837dbee93e8cbf72ff0633c10cdd233a6 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com> Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Since I613d471e5f1e6d563d3853761d8432cba60f3c4c the octavia, ovn, cephadm and nfv scenarios enable valkey, but scenario_images_extra still only listed redis, so valkey images were never built and the pull failed with a 404. cephadm and nfv keep redis - on RL9 they still deploy it, and kolla-ansible-rocky9-cephadm runs the redis to valkey migration Change-Id: Ibf437f8951a0737a2bd0a246c056c94c4860143d Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Mariabackup copies the data directory of mariadb_backup_host but connected through the load balancer, so backup_replica.sh could redirect it to another Galera member. The backup lock then applied to the wrong node, leaving the copied files unquiesced. Connect to api_interface_address and mariadb_port instead, and always use the local backup script. MariaDB 10.11.19 and 11.4.13 no longer tolerate the mismatch. mariadb_backup_target now has no effect, and full backups are named mysqlbackup-<date>.qp.xbc.xbs.gz, as the restore docs describe. Closes-Bug: #2165011 Related-Bug: #2125124 Change-Id: I33ebd36c728ff50df8ebf13fc5af9882a0e71d23 Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com> (cherry picked from commit f1f2702)
github-actions
Bot
added
automated
priteau
approved these changes
Aug 31, 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
3 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.