diff --git a/.gitignore b/.gitignore index de522be..417c904 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/keystone-2015.1.0b3.tar.gz -/keystone-2015.1.0rc2.tar.gz -/keystone-2015.1.0.tar.gz +/keystone-8.0.0.0b1.tar.gz diff --git a/0001-sync-parameter-values-with-keystone-dist.conf.patch b/0001-sync-parameter-values-with-keystone-dist.conf.patch index 5660993..b7ce355 100644 --- a/0001-sync-parameter-values-with-keystone-dist.conf.patch +++ b/0001-sync-parameter-values-with-keystone-dist.conf.patch @@ -1,4 +1,4 @@ -From 8b395bebd81cbfe8bee1bdb2ae9e03b7ba8133a7 Mon Sep 17 00:00:00 2001 +From 6660fe11bb851a313101c3e763e72606b0dadfaf Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Mon, 9 Sep 2013 15:22:20 +0200 Subject: [PATCH] sync parameter values with keystone-dist.conf @@ -11,10 +11,10 @@ Change-Id: If36c384f86843a6506a494d79beca65639fb3480 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample -index 1c2298b..3cf3b06 100644 +index d40adfb..8cbb149 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample -@@ -136,10 +136,11 @@ +@@ -130,10 +130,11 @@ # value) #log_date_format = %Y-%m-%d %H:%M:%S @@ -29,7 +29,7 @@ index 1c2298b..3cf3b06 100644 # (Optional) The base directory used for relative --log-file paths. (string # value) -@@ -160,7 +161,7 @@ +@@ -156,7 +157,7 @@ #syslog_log_facility = LOG_USER # Log output to standard error. (boolean value) @@ -38,7 +38,7 @@ index 1c2298b..3cf3b06 100644 # Format string to use for log messages with context. (string value) #logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s -@@ -364,7 +365,7 @@ +@@ -368,7 +369,7 @@ # Catalog template file name for use with the template catalog backend. (string # value) @@ -46,8 +46,8 @@ index 1c2298b..3cf3b06 100644 +#template_file = /etc/keystone/default_catalog.templates # Catalog backend driver. (string value) - #driver = keystone.catalog.backends.sql.Catalog -@@ -415,7 +416,7 @@ + #driver = sql +@@ -475,7 +476,7 @@ # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection @@ -56,7 +56,7 @@ index 1c2298b..3cf3b06 100644 # The SQLAlchemy connection string to use to connect to the slave database. # (string value) -@@ -1441,7 +1442,7 @@ +@@ -1562,7 +1563,7 @@ # Name of the paste configuration file that defines the available pipelines. # (string value) diff --git a/0002-Fix-xmldsig-import.patch b/0002-Fix-xmldsig-import.patch deleted file mode 100644 index 6fe6b0d..0000000 --- a/0002-Fix-xmldsig-import.patch +++ /dev/null @@ -1,65 +0,0 @@ -From da5d48accb9bce65441827645ee0b06afccb5732 Mon Sep 17 00:00:00 2001 -From: Javier Pena -Date: Wed, 20 May 2015 11:32:18 +0200 -Subject: [PATCH] Fix xmldsig import - -After commit https://goo.gl/TjLQFz to pysaml2, xmldsig was moved -under saml2, no longer being at the top level. Craeting a -conditional import, so it can work now and when the pysaml2 -commit is included in a new release. - -Conflicts: - keystone/tests/unit/test_v3_federation.py - -Change-Id: If01a93a18cef6159adad50496e6335e88f86024d -(cherry picked from commit 71903b78d6b57877c32319335f7aef87332585e9) -(cherry picked from commit d4dcef5098b9f10a239449e05301a7db8410cdb5) ---- - keystone/contrib/federation/idp.py | 5 ++++- - keystone/tests/unit/test_v3_federation.py | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/keystone/contrib/federation/idp.py b/keystone/contrib/federation/idp.py -index 4bca858..84b9332 100644 ---- a/keystone/contrib/federation/idp.py -+++ b/keystone/contrib/federation/idp.py -@@ -17,6 +17,7 @@ import uuid - - from oslo_config import cfg - from oslo_log import log -+from oslo_utils import importutils - from oslo_utils import timeutils - import saml2 - from saml2 import client_base -@@ -26,7 +27,9 @@ from saml2 import saml - from saml2 import samlp - from saml2.schema import soapenv - from saml2 import sigver --import xmldsig -+xmldsig = importutils.try_import("xmldsig") -+if not xmldsig: -+ xmldsig = importutils.try_import("saml2.xmldsig") - - from keystone import exception - from keystone.i18n import _, _LE -diff --git a/keystone/tests/unit/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py -index c1a4a67..efc7649 100644 ---- a/keystone/tests/unit/test_v3_federation.py -+++ b/keystone/tests/unit/test_v3_federation.py -@@ -21,12 +21,15 @@ import mock - from oslo_config import cfg - from oslo_log import log - from oslo_serialization import jsonutils -+from oslo_utils import importutils - from oslotest import mockpatch - import saml2 - from saml2 import saml - from saml2 import sigver - from six.moves import urllib --import xmldsig -+xmldsig = importutils.try_import("xmldsig") -+if not xmldsig: -+ xmldsig = importutils.try_import("saml2.xmldsig") - - from keystone.auth import controllers as auth_controllers - from keystone.auth.plugins import mapped diff --git a/keystone-dist.conf b/keystone-dist.conf index 1d15265..6f24911 100644 --- a/keystone-dist.conf +++ b/keystone-dist.conf @@ -5,5 +5,8 @@ use_stderr = False [database] connection=mysql://keystone:keystone@localhost/keystone +[catalog] +template_file=/etc/keystone/default_catalog.templates + [paste_deploy] config_file=/usr/share/keystone/keystone-dist-paste.ini diff --git a/openstack-keystone.spec b/openstack-keystone.spec index 9ae0000..20c69d8 100644 --- a/openstack-keystone.spec +++ b/openstack-keystone.spec @@ -1,30 +1,38 @@ %global with_doc %{!?_without_doc:1}%{?_without_doc:0} -%global release_name kilo -%global service keystone +%global release_name liberty +%global pypi_name keystone +%global milestone .0b1 %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: openstack-keystone -Version: 2015.1.0 -Release: 3%{?milestone}%{?dist} +# Liberty semver reset +# https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z +Epoch: 1 +Version: 8.0.0 +Release: 0.1%{?milestone}%{?dist} Summary: OpenStack Identity Service License: ASL 2.0 URL: http://keystone.openstack.org/ -Source0: http://launchpad.net/%{service}/%{release_name}/%{version}/+download/%{service}-%{upstream_version}.tar.gz +Source0: http://launchpad.net/%{pypi_name}/%{release_name}/%{release_name}-1/+download/%{pypi_name}-%{upstream_version}.tar.gz + Source1: openstack-keystone.logrotate Source2: openstack-keystone.service Source3: openstack-keystone.sysctl Source5: openstack-keystone-sample-data Source20: keystone-dist.conf +# patches_base=8.0.0.0b1 Patch0001: 0001-sync-parameter-values-with-keystone-dist.conf.patch -Patch0002: 0002-Fix-xmldsig-import.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-pbr +# Required to build keystone.conf +BuildRequires: python-oslo-config +BuildRequires: python-pycadf >= 0.8.0 -Requires: python-keystone = %{version}-%{release} +Requires: python-keystone = %{epoch}:%{version}-%{release} Requires: python-keystoneclient >= 1:1.1.0 Requires(post): systemd @@ -94,14 +102,23 @@ Summary: Documentation for OpenStack Identity Service BuildRequires: python-sphinx >= 1.1.2 BuildRequires: python-oslo-sphinx >= 2.5.0 # for API autodoc +BuildRequires: python-cryptography +BuildRequires: python-dogpile-cache +BuildRequires: python-jsonschema BuildRequires: python-keystonemiddleware BuildRequires: python-ldappool +BuildRequires: python-memcached +BuildRequires: python-oauthlib BuildRequires: python-oslo-concurrency BuildRequires: python-oslo-db BuildRequires: python-oslo-log BuildRequires: python-oslo-messaging BuildRequires: python-oslo-middleware BuildRequires: python-oslo-policy +BuildRequires: python-passlib +BuildRequires: python-paste-deploy +BuildRequires: python-pysaml2 +BuildRequires: python-routes %description doc Keystone is a Python implementation of the OpenStack @@ -114,7 +131,6 @@ This package contains documentation for Keystone. %setup -q -n keystone-%{upstream_version} %patch0001 -p1 -%patch0002 -p1 find . \( -name .gitignore -o -name .placeholder \) -delete find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \; @@ -122,19 +138,19 @@ find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \; rm -f test-requirements.txt requirements.txt %build -cp etc/keystone.conf.sample etc/keystone.conf +PYTHONPATH=. oslo-config-generator --config-file=config-generator/keystone.conf # distribution defaults are located in keystone-dist.conf -%{__python} setup.py build +%{__python2} setup.py build %install -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python2} setup.py install --skip-build --root %{buildroot} # Delete tests -rm -fr %{buildroot}%{python_sitelib}/keystone/tests +rm -fr %{buildroot}%{python2_sitelib}/keystone/tests install -d -m 755 %{buildroot}%{_sysconfdir}/keystone -install -p -D -m 640 etc/keystone.conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf +install -p -D -m 640 etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf install -p -D -m 644 etc/keystone-paste.ini %{buildroot}%{_datadir}/keystone/keystone-dist-paste.ini install -p -D -m 644 %{SOURCE20} %{buildroot}%{_datadir}/keystone/keystone-dist.conf install -p -D -m 644 etc/policy.v3cloudsample.json %{buildroot}%{_datadir}/keystone/policy.v3cloudsample.json @@ -214,8 +230,8 @@ exit 0 %files -n python-keystone %defattr(-,root,root,-) %license LICENSE -%{python_sitelib}/keystone -%{python_sitelib}/keystone-*.egg-info +%{python2_sitelib}/keystone +%{python2_sitelib}/keystone-*.egg-info %if 0%{?with_doc} %files doc diff --git a/sources b/sources index 2d0848d..fdc18bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f0794ce2e8f15561f188278919ade4f keystone-2015.1.0.tar.gz +31523f3b4003aecb13ecafd838fda0e5 keystone-8.0.0.0b1.tar.gz