Synchronise 2024.1 with upstream #616
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Follow-up on I343d8f45a78ebc3c11ed0c68fe8bec24f9ea7929 According the documentation [1] we forgot to share statistics data for swift-account-server and swift-container-server. This change will fix the issue. 1. https://docs.openstack.org/swift/latest/admin_guide.html#cluster-telemetry-and-monitoring Closes-Bug: #1941611 Change-Id: Ib9afd84cac1fcbd96f98b4720ea9c6503bbdb124 Signed-off-by: Maksim Malchuk <[email protected]> (cherry picked from commit 77bd2af)
This patch adds REQUESTS_CA_BUNDLE as it's described in requests documentation [1]. This is needed because some ansible modules inside uses python request library and some users of course using their own CAs. [1] https://requests.readthedocs.io/en/latest/user/advanced/#ssl-cert-verification Closes-Bug: #1967132 Change-Id: I901c2bc8ac477f15d2833e68566b19e437f4b6d1 (cherry picked from commit 366a461)
Inner modules called by the kolla_toolbox module were returning stdout
and stderr as a single output object. This could break JSON parsing if
any data was present in stderr, for example warnings such as:
[WARNING]: Collection ansible.posix does not support Ansible version 2.14.17
Fix by using demux=True to separate the two streams. The stderr content
is logged as it could be useful for troubleshooting or catching
deprecation notices.
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/929294
Change-Id: Iad0476d4511f28c837794352c9a3e2f47113d9a1
Closes-Bug: #2080544
(cherry picked from commit 5407662)
priteau
approved these changes
Sep 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 2024.1 from upstream stable/2024.1.