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 /ansible/group_vars | |
| 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 'ansible/group_vars')
| -rw-r--r-- | ansible/group_vars/all/cinder.yml | 4 | ||||
| -rw-r--r-- | ansible/group_vars/all/common.yml | 2 | ||||
| -rw-r--r-- | ansible/group_vars/all/designate.yml | 4 | ||||
| -rw-r--r-- | ansible/group_vars/all/gnocchi.yml | 4 | ||||
| -rw-r--r-- | ansible/group_vars/all/ironic.yml | 2 | ||||
| -rw-r--r-- | ansible/group_vars/all/masakari.yml | 2 | ||||
| -rw-r--r-- | ansible/group_vars/all/redis.yml | 11 | ||||
| -rw-r--r-- | ansible/group_vars/all/valkey.yml | 30 |
8 files changed, 39 insertions, 20 deletions
diff --git a/ansible/group_vars/all/cinder.yml b/ansible/group_vars/all/cinder.yml index e4659674e..51948a18a 100644 --- a/ansible/group_vars/all/cinder.yml +++ b/ansible/group_vars/all/cinder.yml @@ -19,8 +19,8 @@ cinder_backend_huawei: "no" cinder_backend_huawei_xml_files: [] cinder_volume_group: "cinder-volumes" cinder_target_helper: "{{ 'lioadm' if ansible_facts.os_family == 'RedHat' else 'tgtadm' }}" -# Valid options are [ '', redis, etcd ] -cinder_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}" +# Valid options are [ '', valkey, etcd ] +cinder_coordination_backend: "{{ 'valkey' if enable_valkey | bool else 'etcd' if enable_etcd | bool else '' }}" # Valid options are [ nfs, ceph, s3 ] cinder_backup_driver: "ceph" diff --git a/ansible/group_vars/all/common.yml b/ansible/group_vars/all/common.yml index 4a82c29ea..a32d3154c 100644 --- a/ansible/group_vars/all/common.yml +++ b/ansible/group_vars/all/common.yml @@ -331,7 +331,7 @@ enable_osprofiler: "no" # valid values: ["elasticsearch", "redis"] osprofiler_backend: "elasticsearch" opensearch_connection_string: "elasticsearch://{{ opensearch_address | put_address_in_context('url') }}:{{ opensearch_port }}" -osprofiler_backend_connection_string: "{{ redis_connection_string if osprofiler_backend == 'redis' else opensearch_connection_string }}" +osprofiler_backend_connection_string: "{{ valkey_connection_string if osprofiler_backend in ['redis', 'valkey'] else opensearch_connection_string }}" ###################### # Backend TLS options diff --git a/ansible/group_vars/all/designate.yml b/ansible/group_vars/all/designate.yml index e9916c542..343472a16 100644 --- a/ansible/group_vars/all/designate.yml +++ b/ansible/group_vars/all/designate.yml @@ -12,8 +12,8 @@ designate_ns_record: - "ns1.example.org" designate_backend_external: "no" designate_backend_external_bind9_nameservers: "" -# Valid options are [ '', redis ] -designate_coordination_backend: "{{ 'redis' if enable_redis | bool else '' }}" +# Valid options are [ '', valkey ] +designate_coordination_backend: "{{ 'valkey' if enable_valkey | bool else '' }}" designate_enable_notifications_sink: "no" designate_notifications_topic_name: "notifications_designate" diff --git a/ansible/group_vars/all/gnocchi.yml b/ansible/group_vars/all/gnocchi.yml index f103736b4..3792bf7d0 100644 --- a/ansible/group_vars/all/gnocchi.yml +++ b/ansible/group_vars/all/gnocchi.yml @@ -8,8 +8,8 @@ enable_gnocchi_statsd: "no" # Valid options are [ file, ceph ] gnocchi_backend_storage: "file" -# Valid options are [redis, ''] -gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}" +# Valid options are [valkey, ''] +gnocchi_incoming_storage: "{{ 'valkey' if enable_valkey | bool else '' }}" gnocchi_metric_datadir_volume: "gnocchi" gnocchi_internal_fqdn: "{{ kolla_internal_fqdn }}" diff --git a/ansible/group_vars/all/ironic.yml b/ansible/group_vars/all/ironic.yml index 1acb6e7ab..97df0fe71 100644 --- a/ansible/group_vars/all/ironic.yml +++ b/ansible/group_vars/all/ironic.yml @@ -9,7 +9,7 @@ enable_ironic_pxe_filter: "no" ironic_keystone_user: "ironic" # Coordination backend -ironic_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}" +ironic_coordination_backend: "{{ 'valkey' if enable_valkey | bool else 'etcd' if enable_etcd | bool else '' }}" # Network interfaces ironic_http_interface: "{{ api_interface }}" diff --git a/ansible/group_vars/all/masakari.yml b/ansible/group_vars/all/masakari.yml index bef390e71..1f3d117e1 100644 --- a/ansible/group_vars/all/masakari.yml +++ b/ansible/group_vars/all/masakari.yml @@ -10,4 +10,4 @@ masakari_public_endpoint: "{{ masakari_external_fqdn | kolla_url(public_protocol masakari_api_port: "15868" masakari_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else masakari_api_port }}" masakari_api_listen_port: "{{ masakari_api_port }}" -masakari_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}" +masakari_coordination_backend: "{{ 'valkey' if enable_valkey | bool else 'etcd' if enable_etcd | bool else '' }}" diff --git a/ansible/group_vars/all/redis.yml b/ansible/group_vars/all/redis.yml deleted file mode 100644 index bea98be6e..000000000 --- a/ansible/group_vars/all/redis.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -enable_redis: "no" - -#################### -# Redis options -#################### -redis_connection_string: "redis://{% for host in groups['redis'] %}{% if host == groups['redis'][0] %}default:{{ redis_master_password }}@{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ redis_sentinel_port }}?sentinel=kolla{% else %}&sentinel_fallback={{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ redis_sentinel_port }}{% endif %}{% endfor %}{{ redis_connection_string_extras }}" -redis_connection_string_extras: "&db=0&socket_timeout=60&retry_on_timeout=yes" - -redis_port: "6379" -redis_sentinel_port: "26379" diff --git a/ansible/group_vars/all/valkey.yml b/ansible/group_vars/all/valkey.yml new file mode 100644 index 000000000..c970de6ce --- /dev/null +++ b/ansible/group_vars/all/valkey.yml @@ -0,0 +1,30 @@ +--- +enable_valkey: "no" + +valkey_connection_string: >- + redis://{%- + for host in groups['valkey'] -%} + {%- if host == groups['valkey'][0] -%} + default:{{- valkey_master_password -}}@{{- + 'api' | kolla_address(host) | put_address_in_context('url') + -}}:{{- valkey_sentinel_port -}}?sentinel={{- valkey_sentinel_monitor_name -}} + {%- else -%} + &sentinel_fallback={{- + 'api' | kolla_address(host) | put_address_in_context('url') + -}}:{{- valkey_sentinel_port -}} + {%- endif -%} + {%- endfor -%} + {{- valkey_connection_string_extras -}} + +valkey_connection_string_extras: "&db=0&socket_timeout=60&retry_on_timeout=yes" + +# TODO(mnasiadka): Remove in G/2026.1 +# NOTE(mnasiadka): These can't reference valkey_server_port or valkey_sentinel_port since these +# are changed during migration +redis_port: "6379" +redis_sentinel_port: "26379" + +valkey_server_port: "6379" +valkey_sentinel_port: "26379" +valkey_sentinel_monitor_name: "kolla" +valkey_sentinel_quorum: 2 # TODO (gkoper) Discuss and settle on some sane defaults here |
