Merge pull request #550 from stackhpc/upstream/2025.1-2026-04-17

Synchronise 2025.1 with upstream

Author: Alex-Welsh

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"

ansible/roles/kolla-ansible/templates/overcloud-components.j2

@@ -154,6 +154,9 @@ control
 [redis:children]
 control
 
+[valkey:children]
+control
+
 [blazar:children]
 control
 

ansible/roles/kolla-ansible/vars/main.yml

@@ -235,5 +235,6 @@ kolla_feature_flags:
   - trove
   - trove_singletenant
   - venus
+  - valkey
   - watcher
   - zun

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

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:
 

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``.

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