Synchronise master with upstream - #945
Merged
Merged
Conversation
service-cert-copy falls back to kolla_tls_backend_cert/key when no rabbitmq-specific cert is found, but the precheck did not check for this path, causing a false failure when relying on the shared backend certificate. Closes-Bug: #2166283 Change-Id: I75d4b33fc893bcf0793c1280981574bcdf3f3002 Signed-off-by: fprzewozn <przewozny.franciszek@gmail.com>
Support for JSON policy files was removed from oslo.policy [1]. [1] https://review.opendev.org/c/openstack/oslo.policy/+/929715 Change-Id: Ie92ed0d1f67884f825ff2faa3dd18e69530eee5c Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
This option was removed from Neutron in 2026.1 [1]. It was true by default since 2025.1 anyway [2]. [1] https://review.opendev.org/c/openstack/neutron/+/962881 [2] https://review.opendev.org/c/openstack/neutron/+/930608 Change-Id: I7b393ad92eb82506023cffbfd43888d37b305c9a Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
In generate_tls(), tls_cert and tls_key were assigned with trailing commas, which caused them to become single-element tuples (None,) instead of None. This made the if tls_cert: check always true, leading to TypeError when check_file() received a tuple instead of a string path. Remove the trailing commas so tls_cert and tls_key are plain values. Closes-Bug: #2166845 Change-Id: I06b8876838ee2ec3c20c9a98448fc9e5588f32cd Signed-off-by: Tikhon Masalov <t.masalov@maxima-int.com>
github-actions
Bot
added
automated
github-actions
Bot
added
automated
Alex-Welsh
approved these changes
Sep 14, 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 master from upstream master.