Skip to content

Synchronise 2025.1 with upstream#555

Merged
Alex-Welsh merged 3 commits into
stackhpc/2025.1from
upstream/2025.1-2026-06-15
Jun 15, 2026
Merged

Synchronise 2025.1 with upstream#555
Alex-Welsh merged 3 commits into
stackhpc/2025.1from
upstream/2025.1-2026-06-15

Conversation

@github-actions

Copy link
Copy Markdown

This PR contains a snapshot of 2025.1 from upstream stable/2025.1.

mnasiadka and others added 3 commits June 11, 2026 19:36
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>
@github-actions github-actions Bot requested a review from a team as a code owner June 15, 2026 08:27
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Jun 15, 2026
@Alex-Welsh Alex-Welsh merged commit 632ea15 into stackhpc/2025.1 Jun 15, 2026
4 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/2025.1-2026-06-15 branch June 15, 2026 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants