diff options
| author | Grzegorz Koper <grzegorzk@stackhpc.com> | 2025-09-04 16:56:24 +0200 |
|---|---|---|
| committer | Bartosz Bezak <bartosz@stackhpc.com> | 2025-11-06 16:01:20 +0000 |
| commit | 86c732dfabeb8cc9b116da758b3c55eb5d8a2b43 (patch) | |
| tree | 2d995e9e08f312f68981c7bea5dc39de36d8bc45 /tests/templates | |
| parent | 68852492196e5797deb3077f63777e062bf12d16 (diff) | |
| download | kolla-ansible-86c732dfabeb8cc9b116da758b3c55eb5d8a2b43.tar.gz kolla-ansible-86c732dfabeb8cc9b116da758b3c55eb5d8a2b43.zip | |
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 <bartosz@stackhpc.com>
Co-Authored-By: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: Ifcc6ec6e943c20867d969b0bdb0e4cbac53eea1e
Signed-off-by: Grzegorz Koper <grzegorzk@stackhpc.com>
Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'tests/templates')
| -rw-r--r-- | tests/templates/globals-default.j2 | 23 | ||||
| -rw-r--r-- | tests/templates/inventory.j2 | 4 |
2 files changed, 23 insertions, 4 deletions
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index ddcc631dd..c8a975dbd 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -118,11 +118,15 @@ enable_prometheus_openstack_exporter: "no" enable_tacker: "yes" enable_neutron_sfc: "yes" enable_mistral: "yes" -enable_redis: "yes" +enable_valkey: "yes" enable_barbican: "yes" enable_heat: "yes" # NOTE(yoctozepto): see https://bugs.launchpad.net/kolla-ansible/+bug/1906299 enable_aodh: "yes" +# TODO(gkoper): Remove after G/2026.1 release +{% if is_previous_release %} +enable_redis: "yes" +{% endif %} {% endif %} {% if scenario == "ironic" %} @@ -136,6 +140,7 @@ ironic_dnsmasq_dhcp_ranges: {% if scenario == "masakari" %} enable_masakari: "yes" +enable_valkey: "yes" {% endif %} {% if scenario == "cells" %} @@ -156,7 +161,7 @@ enable_mariabackup: "yes" # kolla-ansible vars enable_cinder: "yes" enable_neutron_agent_ha: "yes" -enable_redis: "yes" +enable_valkey: "yes" cinder_cluster_name: "kolla_ceph" # External Ceph glance_backend_ceph: "yes" @@ -166,8 +171,10 @@ nova_backend_ceph: "yes" rabbitmq_cluster_partition_handling: "autoheal" rabbitmq_extra_config: cluster_keepalive_interval: 50000 -# Redis for coordination +# TODO(gkoper): Remove after G/2026.1 release +{% if is_previous_release %} enable_redis: "yes" +{% endif %} enable_ceph_rgw: "yes" ceph_rgw_hosts: @@ -201,8 +208,11 @@ neutron_enable_ovn_agent: "yes" enable_octavia: "yes" octavia_provider_drivers: "ovn:OVN provider" octavia_provider_agents: "ovn" -enable_redis: "yes" neutron_dns_domain: "example.org." +# TODO(gkoper): Remove after G/2026.1 release +{% if is_previous_release %} +enable_redis: "yes" +{% endif %} {% endif %} {% if scenario == "prometheus-opensearch" %} @@ -234,8 +244,12 @@ octavia_amp_flavor: ram: 1024 disk: 5 octavia_network_type: "tenant" +enable_valkey: "yes" +# TODO(gkoper): Remove after G/2026.1 release +{% if is_previous_release %} enable_redis: "yes" {% endif %} +{% endif %} {% if groups['all'] | length == 1 %} keepalived_track_script_enabled: "no" @@ -281,6 +295,7 @@ skyline_enable_sso: "yes" enable_aodh: "yes" enable_ceilometer: "yes" enable_gnocchi: "yes" +enable_valkey: "yes" {% endif %} mariadb_monitor_read_only_interval: "30000" diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index d0711e93e..8441d825e 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -225,9 +225,13 @@ deployment [zun:children] control +# TODO(gkoper): Remove redis group after G/2026.1 release [redis:children] control +[valkey:children] +control + [blazar:children] control |