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