Synchronise 2025.1 with upstream#555
Merged
Merged
Conversation
Switch from jinja2.Environment to jinja2.sandbox.SandboxedEnvironment to block Server-Side Template Injection attacks. Closes-Bug: #2146056 Change-Id: Iecd1d8dcf99007e3339120961c7c1d0ca12f83d8 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com> (cherry picked from commit 0b20ffc)
setuptools 82.0.0 removed pkg_resources
Traceback (most recent call last):
File "/tmp/ansible_pip_payload_v080mbev/ansible_pip_payload.zip/ansible/modules/pip.py", line 281, in <module>
from pkg_resources import Requirement
ModuleNotFoundError: No module named 'pkg_resources'
fatal: [127.0.0.1]: FAILED! =>
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/993055
Change-Id: Iba981fcc194511d788b25dde7867991d9d165508
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Alex-Welsh
approved these changes
Jun 15, 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
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.