From b38e8f2ba0e1ba6e8400a91a8b595abf8a0e654a Mon Sep 17 00:00:00 2001 From: "Chen, Yan" Date: Tue, 17 Dec 2019 06:10:47 +0000 Subject: [PATCH] [PATCH 02/16] stx-upstream: upgrade python-keystone for Train python-keystone version: 16.0.0 Story: 2007502 Task: 39251 Depends-on: https://review.opendev.org/#/c/716818 Change-Id: I547db8fe8a97ab07d198ed8ec7fdf325d7eeb805 Signed-off-by: Chen, Yan --- centos_srpms_centos.lst | 2 +- .../meta_patches/Add-keyring-patch.patch | 17 ++++---- .../Update-spec-with-tis-additions.patch | 43 +++++++++---------- openstack/python-keystone/centos/srpm_path | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index 8b1487f0..59019b2b 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -1,4 +1,4 @@ -openstack-keystone-15.0.0-0.2.0rc2.el7.src.rpm +openstack-keystone-16.0.0-1.el7.src.rpm python-openstackdocstheme-1.11.0-1.el7.src.rpm python-osc-lib-1.7.0-1.el7.src.rpm python-oslo-messaging-5.30.6-1.el7.src.rpm diff --git a/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch b/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch index d4959919..b480ab10 100644 --- a/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch +++ b/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch @@ -8,27 +8,28 @@ Subject: [PATCH 1/1] Add keyring patch 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SPECS/openstack-keystone.spec b/SPECS/openstack-keystone.spec -index a20bda1..945de6d 100644 +index d3ec1d7..3d5fcee 100644 --- a/SPECS/openstack-keystone.spec +++ b/SPECS/openstack-keystone.spec -@@ -28,7 +28,7 @@ Name: openstack-keystone +@@ -27,7 +27,7 @@ Name: openstack-keystone # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z Epoch: 1 - Version: 15.0.0 --Release: 0.2%{?milestone}%{?dist} -+Release: 0.2.el7%{?_tis_dist}.%{tis_patch_ver} + Version: 16.0.0 +-Release: 1%{?dist} ++Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: OpenStack Identity Service License: ASL 2.0 URL: http://keystone.openstack.org/ -@@ -42,6 +42,9 @@ Source3: openstack-keystone.sysctl +@@ -39,6 +39,9 @@ Source3: openstack-keystone.sysctl Source5: openstack-keystone-sample-data Source20: keystone-dist.conf - + +# STX: Include patches here +Patch1: 0001-Rebasing-Keyring-integration.patch + BuildArch: noarch BuildRequires: openstack-macros BuildRequires: python%{pyver}-devel --- +-- 1.8.3.1 + diff --git a/openstack/python-keystone/centos/meta_patches/Update-spec-with-tis-additions.patch b/openstack/python-keystone/centos/meta_patches/Update-spec-with-tis-additions.patch index cd173f1e..d8f5abd2 100644 --- a/openstack/python-keystone/centos/meta_patches/Update-spec-with-tis-additions.patch +++ b/openstack/python-keystone/centos/meta_patches/Update-spec-with-tis-additions.patch @@ -4,27 +4,27 @@ Date: Mon, 8 Apr 2019 15:40:07 -0400 Subject: [PATCH 1/1] Update-spec-with-tis-additions --- - SPECS/openstack-keystone.spec | 44 +++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 40 insertions(+), 4 deletions(-) + SPECS/openstack-keystone.spec | 50 +++++++++++++++++++++++++++++++++++++------ + 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/SPECS/openstack-keystone.spec b/SPECS/openstack-keystone.spec -index 945de6d..74b6ba2 100644 +index 3d5fcee..97c0586 100644 --- a/SPECS/openstack-keystone.spec +++ b/SPECS/openstack-keystone.spec -@@ -12,7 +12,8 @@ +@@ -11,7 +11,8 @@ %global pyver_build %py%{pyver}_build # End of macros for py2/py3 compatibility - + -%global with_doc 1 +#STX: Turn off doc building +%global with_doc 0 %global service keystone # guard for package OSP does not support %global rhosp 0 -@@ -42,6 +43,13 @@ Source3: openstack-keystone.sysctl +@@ -39,6 +40,13 @@ Source3: openstack-keystone.sysctl Source5: openstack-keystone-sample-data Source20: keystone-dist.conf - + +#STX +Source99: openstack-keystone.service +Source100: keystone-all @@ -34,10 +34,10 @@ index 945de6d..74b6ba2 100644 + # STX: Include patches here Patch1: 0001-Rebasing-Keyring-integration.patch - -@@ -234,9 +242,9 @@ sed -i 's#/local/bin#/bin#' httpd/wsgi-keystone.conf + +@@ -233,9 +241,9 @@ sed -i 's#/local/bin#/bin#' httpd/wsgi-keystone.conf sed -i 's#apache2#httpd#' httpd/wsgi-keystone.conf - + %build -PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keystone.conf -PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keystone.conf --format yaml --output-file=%{service}-schema.yaml @@ -46,18 +46,18 @@ index 945de6d..74b6ba2 100644 +PYTHONPATH=. oslo-config-generator --config-file=config-generator/keystone.conf --format yaml --output-file=%{service}-schema.yaml +PYTHONPATH=. oslo-config-generator --config-file=config-generator/keystone.conf --format json --output-file=%{service}-schema.json # distribution defaults are located in keystone-dist.conf - + %{pyver_build} -@@ -251,6 +259,8 @@ PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keyst +@@ -250,6 +258,8 @@ PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keyst # Instead, ship an empty file that operators can override. echo "{}" > policy.json - + +# STX: default dir for fernet tokens +install -d -m 750 %{buildroot}%{_sysconfdir}/keystone/credential-keys/ install -d -m 755 %{buildroot}%{_sysconfdir}/keystone install -p -D -m 640 etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf install -p -D -m 640 policy.json %{buildroot}%{_sysconfdir}/keystone/policy.json -@@ -261,7 +271,8 @@ install -p -D -m 644 etc/policy.v3cloudsample.json %{buildroot}%{_datadir}/keyst +@@ -259,7 +269,8 @@ install -p -D -m 644 %{SOURCE20} %{buildroot}%{_datadir}/keystone/keystone-dist. install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/keystone/logging.conf install -p -D -m 640 etc/default_catalog.templates %{buildroot}%{_sysconfdir}/keystone/default_catalog.templates install -p -D -m 640 etc/sso_callback_template.html %{buildroot}%{_sysconfdir}/keystone/sso_callback_template.html @@ -67,10 +67,10 @@ index 945de6d..74b6ba2 100644 install -d -m 755 %{buildroot}%{_prefix}/lib/sysctl.d install -p -D -m 644 %{SOURCE3} %{buildroot}%{_prefix}/lib/sysctl.d/openstack-keystone.conf # Install sample data script. -@@ -270,6 +281,21 @@ install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample +@@ -268,6 +279,21 @@ install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample # Install sample HTTPD integration files install -p -D -m 644 httpd/wsgi-keystone.conf %{buildroot}%{_datadir}/keystone/ - + +# STX install keystone cron script +install -p -D -m 755 %{SOURCE101} %{buildroot}%{_bindir}/keystone-fernet-keys-rotate-active + @@ -88,8 +88,8 @@ index 945de6d..74b6ba2 100644 + install -d -m 755 %{buildroot}%{_sharedstatedir}/keystone install -d -m 755 %{buildroot}%{_localstatedir}/log/keystone - -@@ -325,6 +351,10 @@ chmod 660 %{_localstatedir}/log/keystone/keystone.log + +@@ -325,26 +351,36 @@ chmod 660 %{_localstatedir}/log/keystone/keystone.log %{_bindir}/keystone-manage %{_bindir}/keystone-status %{_bindir}/openstack-keystone-sample-data @@ -99,8 +99,7 @@ index 945de6d..74b6ba2 100644 +%{_bindir}/keystone-fernet-keys-rotate-active %dir %{_datadir}/keystone %attr(0644, root, keystone) %{_datadir}/keystone/keystone-dist.conf - %attr(0644, root, keystone) %{_datadir}/keystone/policy.v3cloudsample.json -@@ -332,20 +362,26 @@ chmod 660 %{_localstatedir}/log/keystone/keystone.log + %attr(0644, root, keystone) %{_datadir}/keystone/%{service}-schema.yaml %attr(0644, root, keystone) %{_datadir}/keystone/%{service}-schema.json %attr(0755, root, root) %{_datadir}/keystone/sample_data.sh %attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf @@ -122,13 +121,13 @@ index 945de6d..74b6ba2 100644 - +# STX: add password rules configuration +%attr(0440, root, keystone) %{_sysconfdir}/keystone/password-rules.conf - + %files -n python%{pyver}-keystone -f %{service}.lang +# STX: public.py addition +%{_datarootdir}/keystone/public*.py* %defattr(-,root,root,-) %license LICENSE %{pyver_sitelib}/keystone --- +-- 1.8.3.1 diff --git a/openstack/python-keystone/centos/srpm_path b/openstack/python-keystone/centos/srpm_path index a3ba28c6..d9049384 100644 --- a/openstack/python-keystone/centos/srpm_path +++ b/openstack/python-keystone/centos/srpm_path @@ -1 +1 @@ -mirror:Source/openstack-keystone-15.0.0-0.2.0rc2.el7.src.rpm +mirror:Source/openstack-keystone-16.0.0-1.el7.src.rpm