Skip to content

Synchronise 2025.1 with upstream#550

Merged
Alex-Welsh merged 5 commits intostackhpc/2025.1from
upstream/2025.1-2026-04-17
Apr 17, 2026
Merged

Synchronise 2025.1 with upstream#550
Alex-Welsh merged 5 commits intostackhpc/2025.1from
upstream/2025.1-2026-04-17

Conversation

@github-actions
Copy link
Copy Markdown

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

claudia-lola and others added 5 commits March 13, 2026 09:30
This change is a partial backport of a846ccc to
add valkey support for 2025.1.

Depends-On: I613d471e5f1e6d563d3853761d8432cba60f3c4c
Change-Id: Ied90077ba7104c67ea2623b4de16d56d9f1c1c02
Signed-off-by: Claudia Watson <claudia@stackhpc.com>
Add support for building valkey images when `kolla_enable_valkey` is set
to true (default false).

Change-Id: I62e7a984c41295bf5a24ef6693b474528823f4eb
Signed-off-by: Owen Jones <owen@stackhpc.com>
(cherry picked from commit e239550)
    [DEPRECATION WARNING]: Conditional result (False) was derived from
    value of type 'int' at
    '/home/ubuntu/kayobe/ansible/roles/network-debian/tasks/main.yml:51:9'.
    Conditionals must have a boolean result. This feature will be
    removed from ansible-core version 2.23.
    Origin: /home/ubuntu/kayobe/ansible/roles/network-debian/tasks/main.yml:51:9

    49   command: "udevadm trigger --verbose --subsystem-match=net --action=add"
    50   changed_when: false
    51   when: network_interfaces | networkd_links | length
               ^ column 9

    Broken conditionals are currently allowed because the
    `ALLOW_BROKEN_CONDITIONALS` configuration option is enabled.

TrivialFix

Change-Id: I3e04902ac1cf129d325d291cafb719fd15a84368
Signed-off-by: Will Szumski <will@stackhpc.com>
(cherry picked from commit a46f648)
@github-actions github-actions bot requested a review from a team as a code owner April 17, 2026 09:43
@github-actions github-actions bot added automated Automated action performed by GitHub Actions synchronisation labels Apr 17, 2026
@Alex-Welsh Alex-Welsh closed this Apr 17, 2026
@Alex-Welsh Alex-Welsh reopened this Apr 17, 2026
@Alex-Welsh Alex-Welsh merged commit 3537ee7 into stackhpc/2025.1 Apr 17, 2026
4 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/2025.1-2026-04-17 branch April 17, 2026 10:39
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.

4 participants