Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions all/001-kolla-defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ 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 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}"

memcached_port: "11211"
memcache_security_strategy: "ENCRYPT"
Expand Down Expand Up @@ -1016,10 +1016,10 @@ valkey_connection_string_extras: "&db=0&socket_timeout=60&retry_on_timeout=yes"
####################
# Osprofiler options
####################
# valid values: ["elasticsearch", "redis"]
# valid values: ["elasticsearch", "valkey", "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'] and enable_valkey | bool else redis_connection_string if osprofiler_backend in ['redis', 'valkey'] and enable_redis | bool else opensearch_connection_string }}"

####################
# RabbitMQ options
Expand Down Expand Up @@ -1144,8 +1144,8 @@ barbican_library_path: "/usr/lib/libCryptoki2_64.so"
# 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, redis, '']
gnocchi_incoming_storage: "{{ 'valkey' if enable_valkey | bool else 'redis' if enable_redis | bool else '' }}"
gnocchi_metric_datadir_volume: "gnocchi"

#################################
Expand All @@ -1158,8 +1158,8 @@ cinder_backend_vmwarevc_vmdk: "no"
cinder_backend_vmware_vstorage_object: "no"
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, redis, etcd ]
cinder_coordination_backend: "{{ 'valkey' if enable_valkey | bool else 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}"

# Valid options are [ nfs, ceph, s3 ]
cinder_backup_driver: "ceph"
Expand All @@ -1185,8 +1185,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, redis ]
designate_coordination_backend: "{{ 'valkey' if enable_valkey | bool else 'redis' if enable_redis | bool else '' }}"

designate_enable_notifications_sink: "no"
designate_notifications_topic_name: "notifications_designate"
Expand Down Expand Up @@ -1383,8 +1383,8 @@ s3_secret_key:
# telemetry data.
telegraf_enable_docker_input: "no"

# Valid options are [ '', redis, etcd ]
ironic_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}"
# Valid options are [ '', valkey, redis, etcd ]
ironic_coordination_backend: "{{ 'valkey' if enable_valkey | bool else 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}"

##########
# Octavia
Expand Down
4 changes: 2 additions & 2 deletions all/099-kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ enable_common: "yes"

enable_central_logging: "yes"
enable_prometheus: "yes"
enable_redis: "yes"
enable_redis: "{{ 'yes' if openstack_version in ['2024.1', '2024.2', '2025.1'] else 'no' }}"
enable_grafana: "yes"
enable_valkey: "yes"
enable_valkey: "{{ 'no' if openstack_version in ['2024.1', '2024.2', '2025.1'] else 'yes' }}"

# openstack

Expand Down