From ae68d9bc5f8881d7795948427ecc0cec102a63eb Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Mon, 10 Dec 2018 12:59:41 -0600 Subject: [PATCH 1/8] Update .gitreview for f/centos76 Change-Id: I5e592fcf14cc0f986b35175c3a9214b845bdad06 Signed-off-by: Dean Troyer --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index 95022734..210fcb2d 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/stx-upstream.git +defaultbranch=f/centos76 From 5f6e106776dfb5cb12ddb071e852265cd51062e0 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Tue, 25 Dec 2018 01:25:06 +0800 Subject: [PATCH 2/8] upgrade python-oslo-concurrency to CentOS 7.6 version update to version 3.21.1 Story: 2004522 Task: 28399 Depends-On: https://review.openstack.org/#/c/626422/ Change-Id: Id5b34859caac3c54204b80b8caa921520ea3f859 Signed-off-by: SidneyAn --- .../meta_patches/update-package-versioning-for-TIS-format.patch | 2 +- openstack/python-oslo-concurrency/centos/srpm_path | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack/python-oslo-concurrency/centos/meta_patches/update-package-versioning-for-TIS-format.patch b/openstack/python-oslo-concurrency/centos/meta_patches/update-package-versioning-for-TIS-format.patch index 614debb9..8c38b35b 100644 --- a/openstack/python-oslo-concurrency/centos/meta_patches/update-package-versioning-for-TIS-format.patch +++ b/openstack/python-oslo-concurrency/centos/meta_patches/update-package-versioning-for-TIS-format.patch @@ -5,7 +5,7 @@ index dee2b71..a4a3883 100644 @@ -10,7 +10,7 @@ Name: python-oslo-concurrency - Version: 3.21.0 + Version: 3.21.1 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: OpenStack Oslo concurrency library diff --git a/openstack/python-oslo-concurrency/centos/srpm_path b/openstack/python-oslo-concurrency/centos/srpm_path index 65225c97..0a0a5801 100644 --- a/openstack/python-oslo-concurrency/centos/srpm_path +++ b/openstack/python-oslo-concurrency/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-oslo-concurrency-3.21.0-1.el7.src.rpm +mirror:Source/python-oslo-concurrency-3.21.1-1.el7.src.rpm From 2c5c3b340869ccebaa0e6f0973e07d71acdf8e83 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Sat, 29 Dec 2018 19:33:14 +0800 Subject: [PATCH 3/8] upgrade python-oslo-messaging to CentOS 7.6 version [Patch 2/3] update to version 5.30.6-1 Story: 2004522 Task: 28400 Depends-On: https://review.openstack.org/#/c/627755/ Change-Id: Iea2e5ee2fce293ed37d412557eaad4403ae491bd Signed-off-by: SidneyAn --- .../meta_patches/0004-disable-check-on-build.patch | 5 ++++- .../centos/meta_patches/fix-pifpaf-build-error.patch | 11 +++++++---- ...-heartbeat-rate-to-decrease-polling-interval.patch | 2 +- .../update-package-versioning-for-tis-format.patch | 4 ++-- openstack/python-oslo-messaging/centos/srpm_path | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch b/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch index 966274e4..8eb4532a 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/0004-disable-check-on-build.patch @@ -3,12 +3,15 @@ From: jmckenna Date: Thu, 7 Dec 2017 09:12:43 -0500 Subject: [PATCH] Disable check on build +--- + SPECS/python-oslo-messaging.spec | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index 627a1be..648718a 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -268,11 +268,11 @@ rm -fr doc/build/html/.buildinfo +@@ -281,11 +281,11 @@ rm -fr doc/build/html/.buildinfo %check # Temporarily disabling tests until we have # mock >= 1.2 and pika_pool diff --git a/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch b/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch index 0a3b8461..46f1acaf 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/fix-pifpaf-build-error.patch @@ -3,12 +3,15 @@ From: jmckenna Date: Thu, 7 Dec 2017 09:10:31 -0500 Subject: [PATCH] refactor patch "fix pifpaf build error" +--- + SPECS/python-oslo-messaging.spec | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index abc5dce..627a1be 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -52,6 +52,7 @@ BuildRequires: python-tenacity +@@ -55,6 +55,7 @@ BuildRequires: python-tenacity BuildRequires: python-testrepository BuildRequires: python-testscenarios BuildRequires: python-testtools @@ -16,7 +19,7 @@ index abc5dce..627a1be 100644 Requires: python-amqp >= 2.1.0 -@@ -135,6 +136,7 @@ Requires: python-oslotest +@@ -144,6 +145,7 @@ Requires: python-oslotest Requires: python-testrepository Requires: python-testscenarios Requires: python-testtools @@ -24,7 +27,7 @@ index abc5dce..627a1be 100644 %description -n python2-%{pkg_name}-tests Tests for the OpenStack common messaging library. -@@ -165,6 +167,7 @@ BuildRequires: python3-tenacity +@@ -174,6 +176,7 @@ BuildRequires: python3-tenacity BuildRequires: python3-testrepository BuildRequires: python3-testscenarios BuildRequires: python3-testtools @@ -32,7 +35,7 @@ index abc5dce..627a1be 100644 Requires: python3-amqp >= 2.1.0 Requires: python3-debtcollector >= 1.2.0 -@@ -217,6 +220,7 @@ Requires: python3-oslotest +@@ -228,6 +231,7 @@ Requires: python3-oslotest Requires: python3-testrepository Requires: python3-testscenarios Requires: python3-testtools diff --git a/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch b/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch index eaf17222..4becf19b 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/spec-rabbit-increase-heartbeat-rate-to-decrease-polling-interval.patch @@ -12,7 +12,7 @@ diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index 361f93e..55e8567 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -14,6 +14,10 @@ Summary: OpenStack common messaging library +@@ -17,6 +17,10 @@ Summary: OpenStack common messaging library License: ASL 2.0 URL: https://launchpad.net/oslo Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz diff --git a/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch b/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch index cb82830b..cc711912 100644 --- a/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch +++ b/openstack/python-oslo-messaging/centos/meta_patches/update-package-versioning-for-tis-format.patch @@ -12,10 +12,10 @@ diff --git a/SPECS/python-oslo-messaging.spec b/SPECS/python-oslo-messaging.spec index 59562ac..929e8e0 100644 --- a/SPECS/python-oslo-messaging.spec +++ b/SPECS/python-oslo-messaging.spec -@@ -8,7 +8,7 @@ +@@ -11,7 +11,7 @@ Name: python-oslo-messaging - Version: 5.30.0 + Version: 5.30.6 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: OpenStack common messaging library diff --git a/openstack/python-oslo-messaging/centos/srpm_path b/openstack/python-oslo-messaging/centos/srpm_path index db0845d4..8f4ab8a3 100644 --- a/openstack/python-oslo-messaging/centos/srpm_path +++ b/openstack/python-oslo-messaging/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-oslo-messaging-5.30.0-1.el7.src.rpm +mirror:Source/python-oslo-messaging-5.30.6-1.el7.src.rpm From ef3688ed8deef78474949ce9d661213b858c540c Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Sun, 30 Dec 2018 01:28:13 +0800 Subject: [PATCH 4/8] upgrade python-django-openstack-auth to CentOS 7.6 version [Patch 2/3] update to version 3.6.1-1 Story: 2004522 Task: 28420 Depends-On: https://review.openstack.org/#/c/627764/ Change-Id: I296dcf5bac411ecb9dc26de2bbee0d3b316f9874 Signed-off-by: SidneyAn --- ...0001-Update-package-versioning-for-TIS-format.patch | 2 +- .../centos/meta_patches/0008-Build-python-wheel.patch | 4 ++-- .../patches/0001-Pike-rebase-for-openstack-auth.patch | 10 +++++----- .../centos/patches/0004-Distributed-Keystone.patch | 2 +- .../centos/patches/fix_for_dc_region_switching.patch | 8 ++++---- .../python-django-openstack-auth/centos/srpm_path | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/openstack/python-django-openstack-auth/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/openstack/python-django-openstack-auth/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index fa353f2d..49299f72 100644 --- a/openstack/python-django-openstack-auth/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/openstack/python-django-openstack-auth/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -14,7 +14,7 @@ index 7ac6008..fd06bbc 100644 @@ -7,7 +7,7 @@ Name: python-django-openstack-auth - Version: 3.5.0 + Version: 3.6.1 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: Django authentication backend for OpenStack Keystone diff --git a/openstack/python-django-openstack-auth/centos/meta_patches/0008-Build-python-wheel.patch b/openstack/python-django-openstack-auth/centos/meta_patches/0008-Build-python-wheel.patch index b56cd66d..9c2eb7c5 100644 --- a/openstack/python-django-openstack-auth/centos/meta_patches/0008-Build-python-wheel.patch +++ b/openstack/python-django-openstack-auth/centos/meta_patches/0008-Build-python-wheel.patch @@ -51,8 +51,8 @@ index 89acf21..5e9e8e0 100644 +/wheels/* + %changelog - * Mon Aug 21 2017 Alfredo Moralejo 3.5.0-1 - - Update to 3.5.0 + * Tue Jun 12 2018 RDO 3.6.1-1 + - Update to 3.6.1 -- 1.8.3.1 diff --git a/openstack/python-django-openstack-auth/centos/patches/0001-Pike-rebase-for-openstack-auth.patch b/openstack/python-django-openstack-auth/centos/patches/0001-Pike-rebase-for-openstack-auth.patch index e5708111..9e076c96 100644 --- a/openstack/python-django-openstack-auth/centos/patches/0001-Pike-rebase-for-openstack-auth.patch +++ b/openstack/python-django-openstack-auth/centos/patches/0001-Pike-rebase-for-openstack-auth.patch @@ -55,7 +55,7 @@ index c7d0c51..90e281b 100644 LOG = logging.getLogger(__name__) -@@ -117,6 +116,7 @@ class Login(django_auth_forms.AuthenticationForm): +@@ -118,6 +117,7 @@ class Login(django_auth_forms.AuthenticationForm): @sensitive_variables() def clean(self): @@ -63,7 +63,7 @@ index c7d0c51..90e281b 100644 default_domain = getattr(settings, 'OPENSTACK_KEYSTONE_DEFAULT_DOMAIN', 'Default') -@@ -130,6 +130,14 @@ class Login(django_auth_forms.AuthenticationForm): +@@ -131,6 +131,14 @@ class Login(django_auth_forms.AuthenticationForm): return self.cleaned_data try: @@ -78,7 +78,7 @@ index c7d0c51..90e281b 100644 self.user_cache = authenticate(request=self.request, username=username, password=password, -@@ -141,14 +149,27 @@ class Login(django_auth_forms.AuthenticationForm): +@@ -142,14 +150,27 @@ class Login(django_auth_forms.AuthenticationForm): 'remote_ip': utils.get_client_ip(self.request) } LOG.info(msg) @@ -86,10 +86,10 @@ index c7d0c51..90e281b 100644 + # since this user logged in successfully, clear its + # lockout status + utils.clear_user_lockout(username) -+ ++ + # handle user login + utils.handle_user_login(username, password) -+ ++ except exceptions.KeystoneAuthException as exc: - msg = 'Login failed for user "%(username)s", remote address '\ - '%(remote_ip)s.' % { diff --git a/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch b/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch index 3ee927d8..04d9c444 100644 --- a/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch +++ b/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch @@ -24,7 +24,7 @@ diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py index 90e281b..4834ab2 100644 --- a/openstack_auth/forms.py +++ b/openstack_auth/forms.py -@@ -153,10 +153,10 @@ class Login(django_auth_forms.AuthenticationForm): +@@ -154,10 +154,10 @@ class Login(django_auth_forms.AuthenticationForm): # since this user logged in successfully, clear its # lockout status utils.clear_user_lockout(username) diff --git a/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch b/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch index cb0b9ab0..97d31f0c 100644 --- a/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch +++ b/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch @@ -8,9 +8,9 @@ Subject: [PATCH 1/1] Horizon Distributed Cloud subcloud switching -Fixed tenant list not being displayed on login --- openstack_auth/backend.py | 2 +- - openstack_auth/forms.py | 14 +++++++++++++- + openstack_auth/forms.py | 15 ++++++++++++++- openstack_auth/views.py | 21 ++++++++++++--------- - 3 files changed, 26 insertions(+), 11 deletions(-) + 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/openstack_auth/backend.py b/openstack_auth/backend.py index cd15ca8..4fa7129 100644 @@ -29,7 +29,7 @@ diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py index 4834ab2..49b8d8b 100644 --- a/openstack_auth/forms.py +++ b/openstack_auth/forms.py -@@ -138,11 +138,24 @@ class Login(django_auth_forms.AuthenticationForm): +@@ -139,11 +139,24 @@ class Login(django_auth_forms.AuthenticationForm): if lockedout: raise forms.ValidationError("user currently locked out.") @@ -59,7 +59,7 @@ diff --git a/openstack_auth/views.py b/openstack_auth/views.py index a680abf..0b1351d 100644 --- a/openstack_auth/views.py +++ b/openstack_auth/views.py -@@ -293,15 +293,17 @@ def switch_region(request, region_name, +@@ -289,15 +289,17 @@ def switch_region(request, region_name, endpoint_dict = utils.get_internal_identity_endpoints( request.user.service_catalog, region_filter=region_name) diff --git a/openstack/python-django-openstack-auth/centos/srpm_path b/openstack/python-django-openstack-auth/centos/srpm_path index 378a58ba..a5e2183c 100644 --- a/openstack/python-django-openstack-auth/centos/srpm_path +++ b/openstack/python-django-openstack-auth/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-django-openstack-auth-3.5.0-1.el7.src.rpm +mirror:Source/python-django-openstack-auth-3.6.1-1.el7.src.rpm From bf089a975c8699959293b639444602ea29ddd0dd Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Fri, 4 Jan 2019 19:25:11 +0800 Subject: [PATCH 5/8] upgrade srpm python-heatclient to CentOS 7.6 version [Patch 2/3] upgrade to version 1.11.1 Story: 2004522 Task: 28411 Depends-On: https://review.openstack.org/#/c/628325/ Change-Id: Ifda8aae8e12dfd0f79c3f6cea5d000392c1efde5 Signed-off-by: SidneyAn --- ...age-versioning-format-for-TiS-format.patch | 2 +- ...0002-Packages-sdk-for-remote-clients.patch | 4 +- ...0001-timezone-support-for-heatclient.patch | 38 +++++++++---------- openstack/python-heatclient/centos/srpm_path | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/openstack/python-heatclient/centos/meta_patches/0001-Update-package-versioning-format-for-TiS-format.patch b/openstack/python-heatclient/centos/meta_patches/0001-Update-package-versioning-format-for-TiS-format.patch index ea37d1c6..6c581793 100644 --- a/openstack/python-heatclient/centos/meta_patches/0001-Update-package-versioning-format-for-TiS-format.patch +++ b/openstack/python-heatclient/centos/meta_patches/0001-Update-package-versioning-format-for-TiS-format.patch @@ -14,7 +14,7 @@ index 73a1c6f..7d6d32f 100644 @@ -8,7 +8,7 @@ Name: python-heatclient - Version: 1.11.0 + Version: 1.11.1 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Heat diff --git a/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch b/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch index 80bdb619..2715693b 100644 --- a/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch +++ b/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch @@ -44,8 +44,8 @@ index c5ff419..1f44763 100644 +/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz + %changelog - * Mon Aug 14 2017 Alfredo Moralejo 1.11.0-1 - - Update to 1.11.0 + * Mon Oct 30 2017 rdo-trunk 1.11.1-1 + - Update to 1.11.1 -- 2.7.4 diff --git a/openstack/python-heatclient/centos/patches/0001-timezone-support-for-heatclient.patch b/openstack/python-heatclient/centos/patches/0001-timezone-support-for-heatclient.patch index aa951422..4e85fe5e 100644 --- a/openstack/python-heatclient/centos/patches/0001-timezone-support-for-heatclient.patch +++ b/openstack/python-heatclient/centos/patches/0001-timezone-support-for-heatclient.patch @@ -27,7 +27,7 @@ index f2b20f1..9f2767f 100644 from oslo_serialization import jsonutils from oslo_utils import encodeutils -@@ -371,3 +379,43 @@ def get_response_body(resp): +@@ -447,3 +455,43 @@ def get_response_body(resp): else: body = None return body @@ -75,7 +75,7 @@ diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index ac4ecb9..d8c8324 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py -@@ -45,6 +45,7 @@ def show_deprecated(deprecated, recommended): +@@ -43,6 +43,7 @@ def show_deprecated(deprecated, recommended): ) @@ -83,7 +83,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('-f', '--template-file', metavar='', help=_('Path to the template.')) @utils.arg('-e', '--environment-file', metavar='', -@@ -414,6 +415,7 @@ def do_action_check(hc, args): +@@ -412,6 +413,7 @@ def do_action_check(hc, args): do_stack_list(hc) @@ -91,7 +91,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to describe.')) @utils.arg('--no-resolve-outputs', action="store_true", -@@ -592,6 +594,7 @@ def do_stack_cancel_update(hc, args): +@@ -590,6 +592,7 @@ def do_stack_cancel_update(hc, args): do_stack_list(hc) @@ -99,7 +99,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('-s', '--show-deleted', default=False, action="store_true", help=_('Include soft-deleted stacks in the stack listing.')) @utils.arg('-n', '--show-nested', default=False, action="store_true", -@@ -695,6 +698,7 @@ def do_stack_list(hc, args=None): +@@ -700,6 +703,7 @@ def do_stack_list(hc, args=None): utils.print_list(stacks, fields, sortby_index=sortby_index) @@ -107,7 +107,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to query.')) def do_output_list(hc, args): -@@ -856,6 +860,7 @@ def do_resource_type_template(hc, args): +@@ -861,6 +865,7 @@ def do_resource_type_template(hc, args): print(utils.format_output(template)) @@ -115,7 +115,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to get the template for.')) def do_template_show(hc, args): -@@ -929,6 +934,7 @@ def do_template_validate(hc, args): +@@ -934,6 +939,7 @@ def do_template_validate(hc, args): print(jsonutils.dumps(validation, indent=2, ensure_ascii=False)) @@ -123,7 +123,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to show the resources for.')) @utils.arg('-n', '--nested-depth', metavar='', -@@ -970,6 +976,7 @@ def do_resource_list(hc, args): +@@ -975,6 +981,7 @@ def do_resource_list(hc, args): utils.print_list(resources, fields, sortby_index=4) @@ -131,7 +131,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to show the resource for.')) @utils.arg('resource', metavar='', -@@ -1135,6 +1142,7 @@ def do_hook_clear(hc, args): +@@ -1140,6 +1147,7 @@ def do_hook_clear(hc, args): hook_type, resource_pattern) @@ -139,7 +139,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to show the events for.')) @utils.arg('-r', '--resource', metavar='', -@@ -1258,6 +1266,7 @@ def do_event(hc, args): +@@ -1263,6 +1271,7 @@ def do_event(hc, args): do_event_show(hc, args) @@ -147,7 +147,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to show the events for.')) @utils.arg('resource', metavar='', -@@ -1285,6 +1294,7 @@ def do_event_show(hc, args): +@@ -1290,6 +1299,7 @@ def do_event_show(hc, args): utils.print_dict(event.to_dict(), formatters=formatters) @@ -155,7 +155,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('-f', '--definition-file', metavar='', help=_('Path to JSON/YAML containing map defining ' ', , and .')) -@@ -1355,6 +1365,7 @@ def do_config_list(hc, args): +@@ -1360,6 +1370,7 @@ def do_config_list(hc, args): utils.print_list(scs, fields, sortby_index=None) @@ -163,7 +163,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('ID of the config.')) @utils.arg('-c', '--config-only', default=False, action="store_true", -@@ -1475,6 +1486,7 @@ def do_deployment_list(hc, args): +@@ -1480,6 +1491,7 @@ def do_deployment_list(hc, args): utils.print_list(deployments, fields, sortby_index=5) @@ -171,7 +171,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('ID of the deployment.')) def do_deployment_show(hc, args): -@@ -1490,6 +1502,7 @@ def do_deployment_show(hc, args): +@@ -1495,6 +1507,7 @@ def do_deployment_show(hc, args): print(jsonutils.dumps(sd.to_dict(), indent=2)) @@ -179,7 +179,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('ID of the server to fetch deployments for.')) def do_deployment_metadata_show(hc, args): -@@ -1535,6 +1548,7 @@ def do_deployment_delete(hc, args): +@@ -1540,6 +1553,7 @@ def do_deployment_delete(hc, args): {'count': failure_count, 'total': len(args.id)}) @@ -187,7 +187,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('ID deployment to show the output for.')) @utils.arg('output', metavar='', nargs='?', default=None, -@@ -1589,6 +1603,7 @@ def do_build_info(hc, args): +@@ -1594,6 +1608,7 @@ def do_build_info(hc, args): utils.print_dict(result, formatters=formatters) @@ -195,7 +195,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of stack to snapshot.')) @utils.arg('-n', '--name', metavar='', -@@ -1608,6 +1623,7 @@ def do_stack_snapshot(hc, args): +@@ -1613,6 +1628,7 @@ def do_stack_snapshot(hc, args): print(jsonutils.dumps(snapshot, indent=2, ensure_ascii=False)) @@ -203,7 +203,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of the stack containing the snapshot.')) @utils.arg('snapshot', metavar='', -@@ -1655,6 +1671,7 @@ def do_stack_restore(hc, args): +@@ -1681,6 +1697,7 @@ def do_stack_restore(hc, args): raise exc.CommandError(_('Stack or snapshot not found')) @@ -211,7 +211,7 @@ index ac4ecb9..d8c8324 100644 @utils.arg('id', metavar='', help=_('Name or ID of the stack containing the snapshots.')) def do_snapshot_list(hc, args): -@@ -1678,6 +1695,7 @@ def do_snapshot_list(hc, args): +@@ -1704,6 +1721,7 @@ def do_snapshot_list(hc, args): utils.print_list(snapshots["snapshots"], fields, formatters=formatters) diff --git a/openstack/python-heatclient/centos/srpm_path b/openstack/python-heatclient/centos/srpm_path index 1a807d9c..31f2ec6f 100644 --- a/openstack/python-heatclient/centos/srpm_path +++ b/openstack/python-heatclient/centos/srpm_path @@ -1,2 +1,2 @@ -mirror:Source/python-heatclient-1.11.0-1.el7.src.rpm +mirror:Source/python-heatclient-1.11.1-1.el7.src.rpm From 00c3b8b420f5fc73e429da27896720fbb6bd1686 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Fri, 4 Jan 2019 19:36:49 +0800 Subject: [PATCH 6/8] upgrade srpm python-openstackclient to CentOS 7.6 [Patch 2/3] upgrade to version 3.12.1 Story: 2004522 Task: 28412 Depends-On: https://review.openstack.org/#/c/628328/ Change-Id: I81787fa5fa6a835637628fd44239b9174ab0d407 Signed-off-by: SidneyAn --- ...01-Update-package-versioning-for-TIS-format.patch | 4 ++-- .../meta_patches/0002-spec-remote-clients-sdk.patch | 7 +++++-- ...Openstackclient-implementation-of-novaclien.patch | 4 ++-- ...02-Add-support-for-endpoing-filter-commands.patch | 2 +- ...Openstackclient-implementation-of-novaclien.patch | 8 ++++---- .../0002-US106901-Openstack-CLI-Adoption.patch | 12 ++++++------ .../openstackClient_Passwordchange_warning.patch | 8 +++++++- openstack/python-openstackclient/centos/srpm_path | 2 +- 8 files changed, 28 insertions(+), 19 deletions(-) diff --git a/openstack/python-openstackclient/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/openstack/python-openstackclient/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index fb48c0b6..c7feff5c 100644 --- a/openstack/python-openstackclient/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/openstack/python-openstackclient/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -5,9 +5,9 @@ index 62817fd..2c25c75 100644 @@ -10,7 +10,7 @@ Name: python-openstackclient - Version: 3.12.0 + Version: 3.12.1 -Release: 1%{?dist} -+Release: 2.el7%{?_tis_dist}.%{tis_patch_ver} ++Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: OpenStack Command-line Client License: ASL 2.0 diff --git a/openstack/python-openstackclient/centos/meta_patches/0002-spec-remote-clients-sdk.patch b/openstack/python-openstackclient/centos/meta_patches/0002-spec-remote-clients-sdk.patch index f7f9d5e5..faa7ebe3 100644 --- a/openstack/python-openstackclient/centos/meta_patches/0002-spec-remote-clients-sdk.patch +++ b/openstack/python-openstackclient/centos/meta_patches/0002-spec-remote-clients-sdk.patch @@ -38,5 +38,8 @@ index 2c25c75..874e8a4 100644 +/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz + %changelog - * Mon Aug 21 2017 Alfredo Moralejo 3.12.0-1 - - Update to 3.12.0 + * Tue Apr 03 2018 RDO 3.12.1-1 + - Update to 3.12.1 +-- +1.8.3.1 + diff --git a/openstack/python-openstackclient/centos/patches/0001-US101470-Openstackclient-implementation-of-novaclien.patch b/openstack/python-openstackclient/centos/patches/0001-US101470-Openstackclient-implementation-of-novaclien.patch index d1bd60fb..c0fd0a88 100644 --- a/openstack/python-openstackclient/centos/patches/0001-US101470-Openstackclient-implementation-of-novaclien.patch +++ b/openstack/python-openstackclient/centos/patches/0001-US101470-Openstackclient-implementation-of-novaclien.patch @@ -169,7 +169,7 @@ diff --git a/python_openstackclient.egg-info/SOURCES.txt b/python_openstackclien index 82dae1c..66b9513 100644 --- a/python_openstackclient.egg-info/SOURCES.txt +++ b/python_openstackclient.egg-info/SOURCES.txt -@@ -187,6 +187,8 @@ openstackclient/compute/v2/server_group.py +@@ -188,6 +188,8 @@ openstackclient/compute/v2/server_group.py openstackclient/compute/v2/server_image.py openstackclient/compute/v2/service.py openstackclient/compute/v2/usage.py @@ -178,7 +178,7 @@ index 82dae1c..66b9513 100644 openstackclient/identity/__init__.py openstackclient/identity/client.py openstackclient/identity/common.py -@@ -894,4 +896,4 @@ releasenotes/source/unreleased.rst +@@ -900,4 +902,4 @@ releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder tools/fast8.sh diff --git a/openstack/python-openstackclient/centos/patches/0002-Add-support-for-endpoing-filter-commands.patch b/openstack/python-openstackclient/centos/patches/0002-Add-support-for-endpoing-filter-commands.patch index 201eed54..8e201e4d 100644 --- a/openstack/python-openstackclient/centos/patches/0002-Add-support-for-endpoing-filter-commands.patch +++ b/openstack/python-openstackclient/centos/patches/0002-Add-support-for-endpoing-filter-commands.patch @@ -590,7 +590,7 @@ diff --git a/setup.cfg b/setup.cfg index 1b8e006..d60657f 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -195,12 +195,15 @@ openstack.identity.v3 = +@@ -194,12 +194,15 @@ openstack.identity.v3 = ec2_credentials_delete = openstackclient.identity.v3.ec2creds:DeleteEC2Creds ec2_credentials_list = openstackclient.identity.v3.ec2creds:ListEC2Creds ec2_credentials_show = openstackclient.identity.v3.ec2creds:ShowEC2Creds diff --git a/openstack/python-openstackclient/centos/patches/0002-US101470-Openstackclient-implementation-of-novaclien.patch b/openstack/python-openstackclient/centos/patches/0002-US101470-Openstackclient-implementation-of-novaclien.patch index 35b657ea..cc9a187d 100644 --- a/openstack/python-openstackclient/centos/patches/0002-US101470-Openstackclient-implementation-of-novaclien.patch +++ b/openstack/python-openstackclient/centos/patches/0002-US101470-Openstackclient-implementation-of-novaclien.patch @@ -151,7 +151,7 @@ index c6e2161..551ed8e 100644 parser.add_argument( '--policy', metavar='', -@@ -66,17 +110,21 @@ class CreateServerGroup(command.ShowOne): +@@ -67,17 +111,21 @@ class CreateServerGroup(command.ShowOne): def take_action(self, parsed_args): compute_client = self.app.client_manager.compute info = {} @@ -175,7 +175,7 @@ index c6e2161..551ed8e 100644 class DeleteServerGroup(command.Command): _description = _("Delete existing server group(s).") -@@ -133,8 +181,13 @@ class ListServerGroup(command.Lister): +@@ -134,8 +182,13 @@ class ListServerGroup(command.Lister): def take_action(self, parsed_args): compute_client = self.app.client_manager.compute @@ -189,7 +189,7 @@ index c6e2161..551ed8e 100644 if parsed_args.long: column_headers = columns = ( 'ID', -@@ -143,12 +196,14 @@ class ListServerGroup(command.Lister): +@@ -144,12 +197,14 @@ class ListServerGroup(command.Lister): 'Members', 'Project Id', 'User Id', @@ -204,7 +204,7 @@ index c6e2161..551ed8e 100644 ) return (column_headers, -@@ -175,11 +230,43 @@ class ShowServerGroup(command.ShowOne): +@@ -176,11 +231,43 @@ class ShowServerGroup(command.ShowOne): def take_action(self, parsed_args): compute_client = self.app.client_manager.compute diff --git a/openstack/python-openstackclient/centos/patches/0002-US106901-Openstack-CLI-Adoption.patch b/openstack/python-openstackclient/centos/patches/0002-US106901-Openstack-CLI-Adoption.patch index e4598a6f..db453efa 100644 --- a/openstack/python-openstackclient/centos/patches/0002-US106901-Openstack-CLI-Adoption.patch +++ b/openstack/python-openstackclient/centos/patches/0002-US106901-Openstack-CLI-Adoption.patch @@ -272,7 +272,7 @@ diff --git a/setup.cfg b/setup.cfg index 627ff87..11f7261 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -468,6 +468,8 @@ openstack.volume.v1 = +@@ -463,6 +463,8 @@ openstack.volume.v1 = snapshot_unset = openstackclient.volume.v1.snapshot:UnsetSnapshot volume_create = openstackclient.volume.v1.volume:CreateVolume volume_delete = openstackclient.volume.v1.volume:DeleteVolume @@ -281,7 +281,7 @@ index 627ff87..11f7261 100644 volume_list = openstackclient.volume.v1.volume:ListVolume volume_migrate = openstackclient.volume.v1.volume:MigrateVolume volume_set = openstackclient.volume.v1.volume:SetVolume -@@ -480,6 +482,7 @@ openstack.volume.v1 = +@@ -475,6 +477,7 @@ openstack.volume.v1 = volume_backup_show = openstackclient.volume.v1.backup:ShowVolumeBackup volume_snapshot_create = openstackclient.volume.v1.volume_snapshot:CreateVolumeSnapshot volume_snapshot_delete = openstackclient.volume.v1.volume_snapshot:DeleteVolumeSnapshot @@ -289,7 +289,7 @@ index 627ff87..11f7261 100644 volume_snapshot_list = openstackclient.volume.v1.volume_snapshot:ListVolumeSnapshot volume_snapshot_set = openstackclient.volume.v1.volume_snapshot:SetVolumeSnapshot volume_snapshot_show = openstackclient.volume.v1.volume_snapshot:ShowVolumeSnapshot -@@ -529,7 +532,9 @@ openstack.volume.v2 = +@@ -524,7 +527,9 @@ openstack.volume.v2 = snapshot_show = openstackclient.volume.v2.snapshot:ShowSnapshot snapshot_unset = openstackclient.volume.v2.snapshot:UnsetSnapshot volume_create = openstackclient.volume.v2.volume:CreateVolume @@ -300,7 +300,7 @@ index 627ff87..11f7261 100644 volume_list = openstackclient.volume.v2.volume:ListVolume volume_migrate = openstackclient.volume.v2.volume:MigrateVolume volume_set = openstackclient.volume.v2.volume:SetVolume -@@ -545,6 +550,7 @@ openstack.volume.v2 = +@@ -540,6 +545,7 @@ openstack.volume.v2 = volume_host_set = openstackclient.volume.v2.volume_host:SetVolumeHost volume_snapshot_create = openstackclient.volume.v2.volume_snapshot:CreateVolumeSnapshot volume_snapshot_delete = openstackclient.volume.v2.volume_snapshot:DeleteVolumeSnapshot @@ -308,7 +308,7 @@ index 627ff87..11f7261 100644 volume_snapshot_list = openstackclient.volume.v2.volume_snapshot:ListVolumeSnapshot volume_snapshot_set = openstackclient.volume.v2.volume_snapshot:SetVolumeSnapshot volume_snapshot_show = openstackclient.volume.v2.volume_snapshot:ShowVolumeSnapshot -@@ -584,6 +590,8 @@ openstack.volume.v3 = +@@ -579,6 +585,8 @@ openstack.volume.v3 = consistency_group_snapshot_show = openstackclient.volume.v2.consistency_group_snapshot:ShowConsistencyGroupSnapshot volume_create = openstackclient.volume.v2.volume:CreateVolume volume_delete = openstackclient.volume.v2.volume:DeleteVolume @@ -317,7 +317,7 @@ index 627ff87..11f7261 100644 volume_list = openstackclient.volume.v2.volume:ListVolume volume_migrate = openstackclient.volume.v2.volume:MigrateVolume volume_set = openstackclient.volume.v2.volume:SetVolume -@@ -598,6 +606,7 @@ openstack.volume.v3 = +@@ -593,6 +601,7 @@ openstack.volume.v3 = volume_host_set = openstackclient.volume.v2.volume_host:SetVolumeHost volume_snapshot_create = openstackclient.volume.v2.volume_snapshot:CreateVolumeSnapshot volume_snapshot_delete = openstackclient.volume.v2.volume_snapshot:DeleteVolumeSnapshot diff --git a/openstack/python-openstackclient/centos/patches/openstackClient_Passwordchange_warning.patch b/openstack/python-openstackclient/centos/patches/openstackClient_Passwordchange_warning.patch index a226b0df..70644454 100644 --- a/openstack/python-openstackclient/centos/patches/openstackClient_Passwordchange_warning.patch +++ b/openstack/python-openstackclient/centos/patches/openstackClient_Passwordchange_warning.patch @@ -1,9 +1,12 @@ -From be8b4cdf2939d5cd2bf3f2a38534f0d760f63413 Mon Sep 17 00:00:00 2001 + From be8b4cdf2939d5cd2bf3f2a38534f0d760f63413 Mon Sep 17 00:00:00 2001 From: jmckenna Date: Fri, 6 Oct 2017 10:38:33 -0400 Subject: [PATCH] CGTS-6766: Openstack client logging a warning message when 'admin' user password is changed using 'openstack user set'CLI command +--- + openstackclient/identity/v3/user.py | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index 5f4fb54..201d217 100644 @@ -20,3 +23,6 @@ index 5f4fb54..201d217 100644 class SetPasswordUser(command.Command): +-- +1.8.3.1 + diff --git a/openstack/python-openstackclient/centos/srpm_path b/openstack/python-openstackclient/centos/srpm_path index f8078d19..4f95b235 100644 --- a/openstack/python-openstackclient/centos/srpm_path +++ b/openstack/python-openstackclient/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-openstackclient-3.12.0-1.el7.src.rpm +mirror:Source/python-openstackclient-3.12.1-1.el7.src.rpm From e8e046eba6ca6018698b7cd8d88ac9e8b6b5ba77 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Mon, 7 Jan 2019 19:05:44 +0800 Subject: [PATCH 7/8] upgrade srpm openstack-panko to CentOS 7.6 [Patch 2/3] update to version 3.1.0 Story: 2004522 Task: 28423 Depends-On: https://review.openstack.org/#/c/628814/ Change-Id: I68be8f88f75272704c4dd1550b624db9d82c8f8a Signed-off-by: SidneyAn --- .../meta_patches/0001-panko-config.patch | 24 +++++++------------ openstack/openstack-panko/centos/srpm_path | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/openstack/openstack-panko/centos/meta_patches/0001-panko-config.patch b/openstack/openstack-panko/centos/meta_patches/0001-panko-config.patch index 4593e38e..e51baa98 100644 --- a/openstack/openstack-panko/centos/meta_patches/0001-panko-config.patch +++ b/openstack/openstack-panko/centos/meta_patches/0001-panko-config.patch @@ -23,16 +23,16 @@ diff --git a/SPECS/openstack-panko.spec b/SPECS/openstack-panko.spec index d12da57..90471d9 100644 --- a/SPECS/openstack-panko.spec +++ b/SPECS/openstack-panko.spec -@@ -4,20 +4,27 @@ - +@@ -4,7 +4,7 @@ + Name: openstack-panko - Version: 3.0.0 + Version: 3.1.0 -Release: 1%{?dist} +Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Panko provides Event storage and REST API License: ASL 2.0 - URL: http://github.com/openstack/panko +@@ -12,12 +12,19 @@ URL: http://github.com/openstack/panko Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz Source1: %{pypi_name}-dist.conf Source2: %{pypi_name}.logrotate @@ -72,23 +72,15 @@ index d12da57..90471d9 100644 +install -p -D -m 640 panko/api/panko-api.py %{buildroot}%{_datadir}/panko/panko-api.py #TODO(prad): build the docs at run time, once the we get rid of postgres setup dependency - -@@ -201,14 +215,15 @@ exit 0 - %{_bindir}/panko-api - %{_bindir}/panko-dbsync - %{_bindir}/panko-expirer - + +@@ -204,6 +218,7 @@ exit 0 + %files common %dir %{_sysconfdir}/panko +%{_datadir}/panko/panko-api.* %attr(-, root, panko) %{_datadir}/panko/panko-dist.conf %config(noreplace) %attr(-, root, panko) %{_sysconfdir}/panko/policy.json %config(noreplace) %attr(-, root, panko) %{_sysconfdir}/panko/panko.conf - %config(noreplace) %attr(-, root, panko) %{_sysconfdir}/panko/api_paste.ini - %config(noreplace) %attr(-, root, panko) %{_sysconfdir}/logrotate.d/%{name} - %dir %attr(0755, panko, root) %{_localstatedir}/log/panko - - %defattr(-, panko, panko, -) --- +-- 1.8.3.1 diff --git a/openstack/openstack-panko/centos/srpm_path b/openstack/openstack-panko/centos/srpm_path index b33279f7..b8ed2ce3 100644 --- a/openstack/openstack-panko/centos/srpm_path +++ b/openstack/openstack-panko/centos/srpm_path @@ -1 +1 @@ -mirror:Source/openstack-panko-3.0.0-1.el7.src.rpm +mirror:Source/openstack-panko-3.1.0-1.el7.src.rpm From 852d63c2f0d3f4710f893d5bbfc112ed6e794100 Mon Sep 17 00:00:00 2001 From: Shuicheng Lin Date: Mon, 14 Jan 2019 23:09:00 +0800 Subject: [PATCH 8/8] Fix build failure with python-django-openstack-auth Story: 2004522 Task: 28420 Change-Id: I7f06994f9e32bb4cdfbd547b065f4f55fb43c40c Signed-off-by: Shuicheng Lin --- .../patches/0004-Distributed-Keystone.patch | 20 +------------------ .../patches/fix_for_dc_region_switching.patch | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch b/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch index 04d9c444..30d81d7e 100644 --- a/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch +++ b/openstack/python-django-openstack-auth/centos/patches/0004-Distributed-Keystone.patch @@ -14,29 +14,11 @@ Central Region, there was no way to go back in Horizon from a subcloud region to the SystemController region. We achieve this by caching the SystemController endpoint in the Django Session at the time of login --- - openstack_auth/forms.py | 4 +-- openstack_auth/user.py | 8 ++++- openstack_auth/utils.py | 47 ++++++++++++++++++++++++----- openstack_auth/views.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++++- - 4 files changed, 125 insertions(+), 12 deletions(-) + 3 files changed, 123 insertions(+), 10 deletions(-) -diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py -index 90e281b..4834ab2 100644 ---- a/openstack_auth/forms.py -+++ b/openstack_auth/forms.py -@@ -154,10 +154,10 @@ class Login(django_auth_forms.AuthenticationForm): - # since this user logged in successfully, clear its - # lockout status - utils.clear_user_lockout(username) -- -+ - # handle user login - utils.handle_user_login(username, password) -- -+ - except exceptions.KeystoneAuthException as exc: - if getattr(exc,"invalidCredentials", False): - msg = 'Login failed for user "%(username)s", remote address '\ diff --git a/openstack_auth/user.py b/openstack_auth/user.py index f486bfa..39e3e34 100644 --- a/openstack_auth/user.py diff --git a/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch b/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch index 97d31f0c..77d8e485 100644 --- a/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch +++ b/openstack/python-django-openstack-auth/centos/patches/fix_for_dc_region_switching.patch @@ -85,7 +85,7 @@ index a680abf..0b1351d 100644 if not region_auth_url: msg = _('Cannot switch to subcloud %s, no Identity available ' -@@ -324,7 +326,8 @@ def switch_region(request, region_name, +@@ -320,7 +322,8 @@ def switch_region(request, region_name, try: request.user = auth.authenticate( request=request, auth_url=unscoped_auth.auth_url,