diff --git a/openstack/python-django-openstack-auth/centos/build_srpm.data b/openstack/python-django-openstack-auth/centos/build_srpm.data index 0eac83bb..024e3e13 100755 --- a/openstack/python-django-openstack-auth/centos/build_srpm.data +++ b/openstack/python-django-openstack-auth/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=4 +TIS_PATCH_VER=5 diff --git a/openstack/python-django-openstack-auth/centos/meta_patches/0007-meta-patch-for-distributed-keystone-fix.patch b/openstack/python-django-openstack-auth/centos/meta_patches/0007-meta-patch-for-distributed-keystone-fix.patch index b9a18cb4..f36b7398 100644 --- a/openstack/python-django-openstack-auth/centos/meta_patches/0007-meta-patch-for-distributed-keystone-fix.patch +++ b/openstack/python-django-openstack-auth/centos/meta_patches/0007-meta-patch-for-distributed-keystone-fix.patch @@ -8,15 +8,15 @@ Subject: [PATCH 1/1] [PATCH] meta patch for distributed keystone fix 1 file changed, 1 insertion(+) diff --git a/SPECS/python-django-openstack-auth.spec b/SPECS/python-django-openstack-auth.spec -index 8be7844..f98d7ba 100644 +index 90b4692..89acf21 100644 --- a/SPECS/python-django-openstack-auth.spec +++ b/SPECS/python-django-openstack-auth.spec -@@ -20,6 +20,7 @@ Patch0002: 0002-disable-token-validation-per-auth-request.patch +@@ -19,6 +19,7 @@ Patch0001: 0001-Pike-rebase-for-openstack-auth.patch + Patch0002: 0002-disable-token-validation-per-auth-request.patch Patch0003: 0003-cache-authorized-tenants-in-cookie-to-improve-performance.patch Patch0004: 0004-Distributed-Keystone.patch - Patch0005: fix_for_session_timeout.patch -+Patch0006: fix_for_dc_region_switching.patch - ++Patch0005: fix_for_dc_region_switching.patch + BuildArch: noarch -- diff --git a/openstack/python-django-openstack-auth/centos/meta_patches/PATCH_ORDER b/openstack/python-django-openstack-auth/centos/meta_patches/PATCH_ORDER index a15d1983..e99360e4 100644 --- a/openstack/python-django-openstack-auth/centos/meta_patches/PATCH_ORDER +++ b/openstack/python-django-openstack-auth/centos/meta_patches/PATCH_ORDER @@ -4,5 +4,4 @@ 0004-meta-disable-token-validation-per-auth-req.patch 0005-meta-cache-authorized-tenants-in-cookie-to-improve-performance.patch 0006-meta-Distributed-Keystone.patch -spec-include-fix_for_session_timeout.patch 0007-meta-patch-for-distributed-keystone-fix.patch diff --git a/openstack/python-django-openstack-auth/centos/meta_patches/spec-include-fix_for_session_timeout.patch b/openstack/python-django-openstack-auth/centos/meta_patches/spec-include-fix_for_session_timeout.patch deleted file mode 100644 index f2a25f62..00000000 --- a/openstack/python-django-openstack-auth/centos/meta_patches/spec-include-fix_for_session_timeout.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2ba11680cdbdf309122e0ad2d624e768deba8ec5 Mon Sep 17 00:00:00 2001 -From: Kristine Bujold -Date: Wed, 6 Jun 2018 08:02:32 -0400 -Subject: [PATCH 1/1] Adding patch file - ---- - SPECS/python-django-openstack-auth.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SPECS/python-django-openstack-auth.spec b/SPECS/python-django-openstack-auth.spec -index f925d87..9e5aacb 100644 ---- a/SPECS/python-django-openstack-auth.spec -+++ b/SPECS/python-django-openstack-auth.spec -@@ -19,6 +19,7 @@ Patch0001: 0001-Pike-rebase-for-openstack-auth.patch - Patch0002: 0002-disable-token-validation-per-auth-request.patch - Patch0003: 0003-cache-authorized-tenants-in-cookie-to-improve-performance.patch - Patch0004: 0004-Distributed-Keystone.patch -+Patch0005: fix_for_session_timeout.patch - - BuildArch: noarch - --- -1.8.3.1 - diff --git a/openstack/python-django-openstack-auth/centos/patches/fix_for_session_timeout.patch b/openstack/python-django-openstack-auth/centos/patches/fix_for_session_timeout.patch deleted file mode 100644 index d7fec3cc..00000000 --- a/openstack/python-django-openstack-auth/centos/patches/fix_for_session_timeout.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ff48b415941e51f02ba7f9377ba3f9225721bfe1 Mon Sep 17 00:00:00 2001 -From: Kristine Bujold -Date: Wed, 6 Jun 2018 07:53:59 -0400 -Subject: [PATCH 1/1] Fix horizon user session timeout - ---- - openstack_auth/views.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/openstack_auth/views.py b/openstack_auth/views.py -index ad339c4..a680abf 100644 ---- a/openstack_auth/views.py -+++ b/openstack_auth/views.py -@@ -122,6 +122,10 @@ def login(request, template_name=None, extra_context=None, **kwargs): - region_name = regions.get(login_region) - request.session['region_endpoint'] = region - request.session['region_name'] = region_name -+ -+ # Adding the user's last_login to the session -+ request.session['_user_login'] = request.user.last_login -+ - expiration_time = request.user.time_until_expiration() - threshold_days = getattr( - settings, 'PASSWORD_EXPIRES_WARNING_THRESHOLD_DAYS', -1) --- -1.8.3.1 -