Skip to content

Select valkey over redis from 2025.2 #2918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berendt merged 1 commit into from
Jun 30, 2026
Merged

Select valkey over redis from 2025.2 #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions environments/kolla/secrets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ rabbitmq_password: password
rally_database_password: RUFKPzTRYhPW3ZeQBf7dTaoOq4RMcjPQctzxefSi
rbd_secret_uuid: 5a2bf0bf-e1ab-4a6a-bc32-404bb6ba91fd
redis_master_password: QHNA1SZRlOKzLADhUd5ZDgpHfQe6dNfr3bwEdY24
valkey_master_password: 22vLVyeTJ1fkgVdfjesrPeY5PxPQvOOWoDHWzxxQ
sahara_database_password: PtBpvrXbskbKlJuzkLjWfAmmVEYlO7XYzLm8tOmi
sahara_keystone_password: 2hI2w1BuVEEck4BAMmMSxCJcIaDTvl73o5YQboFM
searchlight_keystone_password: UMyLfPZF1UkLArS58vHx6VSn4AcAFrPHTBsMV9Ra
Expand Down
4 changes: 3 additions & 1 deletion scripts/deploy-baremetal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ osism apply wait-for-connection -l testbed-resource-nodes -e ireallymeanit=yes
# pull images
osism apply -r 2 -e custom baremetal-pull-images

key_value_store=$(valkey_or_redis)

osism apply common
osism apply loadbalancer
osism apply openstackclient
osism apply memcached
osism apply redis
osism apply "$key_value_store"
osism apply mariadb
osism apply rabbitmq

Expand Down
4 changes: 3 additions & 1 deletion scripts/deploy/200-infrastructure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ source /opt/configuration/scripts/manager-version.sh

OPENSTACK_VERSION=$(docker inspect --format '{{ index .Config.Labels "de.osism.release.openstack" }}' kolla-ansible)

key_value_store=$(valkey_or_redis)

osism apply openstackclient
osism apply common
osism apply loadbalancer
osism apply opensearch
osism apply memcached
osism apply redis
osism apply "$key_value_store"
osism apply mariadb
osism apply rabbitmq
osism apply openvswitch
Expand Down
12 changes: 12 additions & 0 deletions scripts/include.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,15 @@ sync_inventory() {
osism reconciler sync
fi
}

# Select the key-value store service for the active OpenStack release. Upstream
# kolla-ansible replaced redis with valkey at 2025.2; older releases still ship
# redis. The release is read from the kolla-ansible image label.
valkey_or_redis() {
local openstack_version
openstack_version=$(docker inspect --format '{{ index .Config.Labels "de.osism.release.openstack" }}' kolla-ansible 2>/dev/null)
case "$openstack_version" in
2023.*|2024.*|2025.1) echo redis ;;
*) echo valkey ;;
esac
}
4 changes: 3 additions & 1 deletion scripts/upgrade/200-infrastructure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ set -e

source /opt/configuration/scripts/include.sh

key_value_store=$(valkey_or_redis)

osism apply openstackclient
osism apply -a upgrade common
osism apply -a upgrade loadbalancer
osism apply -a upgrade opensearch
osism apply -a upgrade memcached
osism apply -a upgrade redis
osism apply -a upgrade "$key_value_store"
osism apply -a upgrade mariadb
osism apply -a upgrade rabbitmq
osism apply -a upgrade openvswitch
Expand Down