Synchronise 2025.1 with upstream#865
Merged
Alex-Welsh merged 7 commits intostackhpc/2025.1from Apr 20, 2026
Merged
Conversation
When migrating from Redis to Valkey, 'valkey_master_password' is introduced as a new requirement. During an upgrade, 'kolla-mergepwd' previously left the newly generated random password for Valkey, ignoring the existing Redis password. This caused critical authentication failures. Specifically, for users utilizing custom Keystone caching solutions, starting Valkey with a new password would seriously damage the entire cluster. Furthermore, in standard upgrades, Octavia stops working due to the password change, leaving the service unstable until the upgrade is complete. This patch updates 'mergepwd.py' to detect when 'valkey_master_password' is a new entry and automatically assigns it the value of the existing 'redis_master_password'. This ensures a seamless transition and maintains cloud stability during the Redis-to-Valkey migration. Closes-Bug: #2138461 Change-Id: Id0eb88e739c44016a0bd118793f81ff66a624655 Signed-off-by: Piotr Milewski <vurmil@gmail.com> (cherry picked from commit 10fddfc)
This is a non-trivial backport of Valkey deployment that is required for migration to Rocky Linux 10 before upgrading to Flamingo/Gazpacho. Additional subcommand and playbook to migrate from Redis to Valkey will be added in a follow-up. Cephadm bits backported from I51823808c4e4ac08ae8f080aacf6a3759589571d Co-Authored-By: Bartosz Bezak <bartosz@stackhpc.com> Change-Id: I613d471e5f1e6d563d3853761d8432cba60f3c4c Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com> Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Co-Authored-By: Bartosz Bezak <bartosz@stackhpc.com> Change-Id: I808a0fc6886036be20a4fcf43991b3bd92a52f23 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com> Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
…nto stable/2025.1
…s" into stable/2025.1
Change-Id: Ief8b52e57c156023bd2b704967c769c77b37687e Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
github-actions
Bot
added
automated
Alex-Welsh
approved these changes
Apr 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2025.1 from upstream stable/2025.1.