diff options
| -rwxr-xr-x | kolla_ansible/cmd/mergepwd.py | 10 | ||||
| -rw-r--r-- | releasenotes/notes/bug-2138461-867ac0f0c465934b.yaml | 12 |
2 files changed, 22 insertions, 0 deletions
diff --git a/kolla_ansible/cmd/mergepwd.py b/kolla_ansible/cmd/mergepwd.py index 00f38d976..fa99f57fb 100755 --- a/kolla_ansible/cmd/mergepwd.py +++ b/kolla_ansible/cmd/mergepwd.py @@ -46,6 +46,16 @@ def mergepwd(old, new, final, clean=False): print("ERROR: New passwords file not in expected key/value format") sys.exit(1) + # TODO(vurmil): Remove in H/2026.2 release as Redis migration is + # no longer required + if 'valkey_master_password' in new_passwords and \ + 'redis_master_password' in old_passwords and \ + 'valkey_master_password' not in old_passwords: + + old_redis_pass = old_passwords.get('redis_master_password') + if old_redis_pass: + new_passwords['valkey_master_password'] = old_redis_pass + if clean: # keep only new keys for key in new_passwords: diff --git a/releasenotes/notes/bug-2138461-867ac0f0c465934b.yaml b/releasenotes/notes/bug-2138461-867ac0f0c465934b.yaml new file mode 100644 index 000000000..caf40efab --- /dev/null +++ b/releasenotes/notes/bug-2138461-867ac0f0c465934b.yaml @@ -0,0 +1,12 @@ +--- +fixes: + - | + Fixed a critical issue in ``kolla-mergepwd`` where the migration from + Redis to Valkey resulted in authentication failures. The tool now + automatically inherits the existing ``redis_master_password`` into the + new ``valkey_master_password`` field during upgrades. This prevents + serious cluster damage in deployments using custom Keystone caching + solutions and ensures Octavia remains stable throughout the upgrade + process, avoiding global ``HTTP 401 Unauthorized`` errors caused by + password mismatches. + `LP#2138461 <https://launchpad.net/bugs/2138461>`__ |