From 86c732dfabeb8cc9b116da758b3c55eb5d8a2b43 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Thu, 4 Sep 2025 16:56:24 +0200 Subject: Replace Redis with Valkey This change replaces Redis with Valkey, which is non-existent on Rocky Linux 10 / CentOS Stream 10 due to licensing issues. Co-Authored-By: Bartosz Bezak Co-Authored-By: Michal Nasiadka Change-Id: Ifcc6ec6e943c20867d969b0bdb0e4cbac53eea1e Signed-off-by: Grzegorz Koper Signed-off-by: Bartosz Bezak Signed-off-by: Michal Nasiadka --- zuul.d/scenarios/cephadm.yaml | 6 +++--- zuul.d/scenarios/masakari.yaml | 5 +++-- zuul.d/scenarios/nfv.yaml | 6 +++--- zuul.d/scenarios/octavia.yaml | 6 +++--- zuul.d/scenarios/ovn.yaml | 1 - zuul.d/scenarios/telemetry.yaml | 5 +++-- 6 files changed, 15 insertions(+), 14 deletions(-) (limited to 'zuul.d/scenarios') diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml index 28ac2128b..2120af30e 100644 --- a/zuul.d/scenarios/cephadm.yaml +++ b/zuul.d/scenarios/cephadm.yaml @@ -4,9 +4,9 @@ parent: kolla-ansible-base voting: false files: - - ^ansible/group_vars/all/(ceph|ceph-rgw|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq).yml + - ^ansible/group_vars/all/(ceph|ceph-rgw|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey).yml - ^ansible/group_vars/baremetal/ansible-python-interpreter.yml - - ^ansible/roles/(ceph-rgw|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq)/ + - ^ansible/roles/(ceph-rgw|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey)/ - ^roles/cephadm/ vars: kolla_ansible_setup_disks_file_path: "/var/lib/ceph-osd.img" @@ -16,7 +16,7 @@ scenario: cephadm scenario_images_extra: - ^cinder - - ^redis + - ^valkey - job: name: kolla-ansible-debian-bookworm-cephadm diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml index 4593f0a67..02eb2a98e 100644 --- a/zuul.d/scenarios/masakari.yaml +++ b/zuul.d/scenarios/masakari.yaml @@ -4,14 +4,15 @@ parent: kolla-ansible-base voting: false files: !inherit - - ^ansible/group_vars/all/(hacluster|masakari).yml - - ^ansible/roles/(hacluster|masakari)/ + - ^ansible/group_vars/all/(hacluster|masakari|valkey).yml + - ^ansible/roles/(hacluster|masakari|valkey)/ - ^tests/test-masakari.sh vars: scenario: masakari scenario_images_extra: - ^masakari - ^hacluster + - ^valkey # TODO: Remove once Masakari has TLS support tls_enabled: false diff --git a/zuul.d/scenarios/nfv.yaml b/zuul.d/scenarios/nfv.yaml index 60e44f7ee..03df813c0 100644 --- a/zuul.d/scenarios/nfv.yaml +++ b/zuul.d/scenarios/nfv.yaml @@ -4,8 +4,8 @@ parent: kolla-ansible-base voting: false files: !inherit - - ^ansible/group_vars/all/(aodh|barbican|heat|mistral|redis|tacker).yml - - ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/ + - ^ansible/group_vars/all/(aodh|barbican|heat|mistral|valkey|tacker).yml + - ^ansible/roles/(aodh|barbican|heat|mistral|valkey|tacker)/ - ^tests/test-scenario-nfv.sh vars: scenario: nfv @@ -13,7 +13,7 @@ - ^aodh - ^tacker - ^mistral - - ^redis + - ^valkey - ^barbican tls_enabled: false diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml index d7fdcb208..520969f65 100644 --- a/zuul.d/scenarios/octavia.yaml +++ b/zuul.d/scenarios/octavia.yaml @@ -4,13 +4,13 @@ parent: kolla-ansible-base voting: false files: !inherit - - ^ansible/group_vars/all/octavia.yml - - ^ansible/roles/(octavia|octavia-certificates)/ + - ^ansible/group_vars/all/(octavia|valkey).yml + - ^ansible/roles/(octavia|octavia-certificates|valkey)/ - ^tests/test-octavia.sh vars: scenario: octavia scenario_images_extra: - - ^redis + - ^valkey - ^octavia tls_enabled: false diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml index 6e9472845..cfc4b2926 100644 --- a/zuul.d/scenarios/ovn.yaml +++ b/zuul.d/scenarios/ovn.yaml @@ -9,7 +9,6 @@ vars: scenario: ovn scenario_images_extra: - - ^redis - ^octavia - ^ovn diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml index 08d01d890..bd762ea4c 100644 --- a/zuul.d/scenarios/telemetry.yaml +++ b/zuul.d/scenarios/telemetry.yaml @@ -4,8 +4,8 @@ parent: kolla-ansible-base voting: false files: - - ^ansible/group_vars/all/(aodh|ceilometer|gnocchi).yml - - ^ansible/roles/(aodh|ceilometer|gnocchi)/ + - ^ansible/group_vars/all/(aodh|ceilometer|gnocchi|valkey).yml + - ^ansible/roles/(aodh|ceilometer|gnocchi|valkey)/ - ^tests/test-telemetry.sh vars: scenario: telemetry @@ -13,6 +13,7 @@ - ^aodh - ^ceilometer - ^gnocchi + - ^valkey - job: name: kolla-ansible-debian-bookworm-telemetry -- cgit v1.2.3