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 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..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 -@@ -153,10 +153,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 cb0b9ab0..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 @@ -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) @@ -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, 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 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 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