From 6bda8caca53b62b79cf2b38f939cce4898e5badd Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Thu, 12 Mar 2026 10:21:03 +0000 Subject: [PATCH 1/3] Add Valkey support This change is a partial backport of a846cccc63 to add valkey support for 2025.1. Depends-On: I613d471e5f1e6d563d3853761d8432cba60f3c4c Change-Id: Ied90077ba7104c67ea2623b4de16d56d9f1c1c02 Signed-off-by: Claudia Watson --- ansible/roles/kolla-ansible/templates/overcloud-components.j2 | 3 +++ ansible/roles/kolla-ansible/vars/main.yml | 1 + etc/kayobe/kolla.yml | 1 + 3 files changed, 5 insertions(+) diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index 88781653f..b8925316e 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -154,6 +154,9 @@ control [redis:children] control +[valkey:children] +control + [blazar:children] control diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 389a6be03..176b80d5d 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -235,5 +235,6 @@ kolla_feature_flags: - trove - trove_singletenant - venus + - valkey - watcher - zun diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 0366f1825..4fe4a4bee 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -442,6 +442,7 @@ #kolla_enable_trove: #kolla_enable_trove_singletenant: #kolla_enable_venus: +#kolla_enable_valkey: #kolla_enable_watcher: #kolla_enable_zun: From 44bb7a43e4cddd0caf1f8af483a6a2dd9c37a738 Mon Sep 17 00:00:00 2001 From: Owen Jones Date: Thu, 2 Apr 2026 15:22:33 +0100 Subject: [PATCH 2/3] Add support for building valkey images Add support for building valkey images when `kolla_enable_valkey` is set to true (default false). Change-Id: I62e7a984c41295bf5a24ef6693b474528823f4eb Signed-off-by: Owen Jones (cherry picked from commit e239550683ce591b820d54c68833f7cac3f53eaf) --- ansible/inventory/group_vars/all/kolla | 3 +++ releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla index 6ab1c8d2e..b24f9bb2f 100644 --- a/ansible/inventory/group_vars/all/kolla +++ b/ansible/inventory/group_vars/all/kolla @@ -256,6 +256,8 @@ overcloud_container_image_regex_map: enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}" - regex: ^trove enabled: "{{ kolla_enable_trove | bool }}" + - regex: ^valkey + enabled: "{{ kolla_enable_valkey | bool }}" - regex: ^watcher enabled: "{{ kolla_enable_watcher | bool }}" - regex: ^zun @@ -579,6 +581,7 @@ kolla_enable_swift: "no" kolla_enable_tacker: "no" kolla_enable_telegraf: "no" kolla_enable_trove: "no" +kolla_enable_valkey: "no" kolla_enable_vitrage: "no" kolla_enable_watcher: "no" kolla_enable_zun: "no" diff --git a/releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml b/releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml new file mode 100644 index 000000000..1d6534477 --- /dev/null +++ b/releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + ``valkey`` images are now built when ``kolla_enable_valkey`` is set to + ``true``. From 5df157b38abc992f4ece634d9473c8dcc024330f Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 29 Jan 2026 16:00:32 +0000 Subject: [PATCH 3/3] [networkd] Fix broken conditional [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 (cherry picked from commit a46f6484f8b361c322533bfe60b6cfe12aeca85a) --- ansible/roles/network-debian/tasks/main.yml | 2 +- requirements.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/network-debian/tasks/main.yml b/ansible/roles/network-debian/tasks/main.yml index 27091a841..c1c75ea53 100644 --- a/ansible/roles/network-debian/tasks/main.yml +++ b/ansible/roles/network-debian/tasks/main.yml @@ -48,4 +48,4 @@ become: true command: "udevadm trigger --verbose --subsystem-match=net --action=add" changed_when: false - when: network_interfaces | networkd_links | length + when: network_interfaces | networkd_links | length > 0 diff --git a/requirements.yml b/requirements.yml index f54869041..1c534cace 100644 --- a/requirements.yml +++ b/requirements.yml @@ -12,7 +12,7 @@ collections: - name: openstack.cloud version: '<3' - name: stackhpc.linux - version: 1.5.1 + version: 1.5.2 - name: stackhpc.network version: 1.0.0 - name: stackhpc.openstack