diff -Nru horizon-23.3.0/debian/changelog horizon-23.3.0/debian/changelog --- horizon-23.3.0/debian/changelog 2023-10-26 18:38:06.000000000 +0000 +++ horizon-23.3.0/debian/changelog 2024-04-01 19:07:20.000000000 +0000 @@ -1,3 +1,9 @@ +horizon (4:23.3.0-0ubuntu1.2) mantic; urgency=medium + + * d/p/lp1728031.patch: Fix admin unable to reset user's password. + + -- Rodrigo Barbieri Mon, 01 Apr 2024 19:07:20 +0000 + horizon (4:23.3.0-0ubuntu1.1) mantic; urgency=medium * d/p/ubuntu_settings.patch, d/p/switch-to-pymemcachecache-backend.patch, diff -Nru horizon-23.3.0/debian/patches/lp1728031.patch horizon-23.3.0/debian/patches/lp1728031.patch --- horizon-23.3.0/debian/patches/lp1728031.patch 1970-01-01 00:00:00.000000000 +0000 +++ horizon-23.3.0/debian/patches/lp1728031.patch 2024-04-01 19:07:04.000000000 +0000 @@ -0,0 +1,38 @@ +From e9bf695641f4c07fadacf12599ae406c5ecd3ca6 Mon Sep 17 00:00:00 2001 +From: Rodrigo Barbieri +Date: Thu, 14 Mar 2024 15:22:14 -0300 +Subject: [PATCH] Fix error on changing user password by admin + +Previous change I8438bedaf7cead452fc499e484d23690b48894d9 +attempted to address bug LP#1728031 by improving upon +patch https://review.opendev.org/854005 but missed the +line that allows the keystone client to properly +authenticate a cloud admin user that IS NOT in the +default domain. + +Without this 1-line fix, a cloud admin that is not +in the default domain will face an "incorrect admin +password" error in the UI (despite the admin password +being correct) and an authentication error in the logs, +regardless of the endpoint type used (adminURL, +internalURL or publicURL). + +Closes-bug: #1728031 +Change-Id: I018e7d9cb84fd6ce8635c9054e15052ded7e9368 +(cherry picked from commit da8e959298575127434e6e15aae5d1f0638a6e22) +--- + openstack_dashboard/api/keystone.py | 1 + + 1 file changed, 1 insertion(+) + +Index: horizon-23.3.0/openstack_dashboard/api/keystone.py +=================================================================== +--- horizon-23.3.0.orig/openstack_dashboard/api/keystone.py ++++ horizon-23.3.0/openstack_dashboard/api/keystone.py +@@ -476,6 +476,7 @@ def user_verify_admin_password(request, + username=request.user.username, + password=admin_password, + insecure=insecure, ++ user_domain_name=request.user.user_domain_name, + cacert=cacert, + auth_url=endpoint + ) diff -Nru horizon-23.3.0/debian/patches/series horizon-23.3.0/debian/patches/series --- horizon-23.3.0/debian/patches/series 2023-10-26 18:38:06.000000000 +0000 +++ horizon-23.3.0/debian/patches/series 2024-04-01 19:06:35.000000000 +0000 @@ -5,3 +5,4 @@ fix-test-failures-with-Django-4.x.patch switch-to-pymemcachecache-backend.patch ubuntu_settings.patch +lp1728031.patch