Hello community,
here is the log from the commit of package openstack-keystone for
openSUSE:Factory checked in at 2014-04-14 10:55:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-keystone (Old)
and /work/SRC/openSUSE:Factory/.openstack-keystone.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-keystone"
Changes:
--------
---
/work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone-doc.changes
2013-04-29 14:09:43.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone-doc.changes
2014-04-14 10:55:04.000000000 +0200
@@ -1,0 +2,488 @@
+Wed Apr 9 16:57:38 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev14.gb07840a:
+ * Updated from global requirements
+ * Fix invalid LDAP filter for user ID with comma
+
+-------------------------------------------------------------------
+Thu Mar 27 01:40:19 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.2.dev176.g724d056:
+ * Open Juno development
+ * Enable lazy translations in httpd/keystone.py
+ * Avoid using .values() on the indexed columns
+ * Imported Translations from Transifex
+ * revert deprecation of v2 API
+ * Updated from global requirements
+ * Uses generator expressions instead of filter
+
+-------------------------------------------------------------------
+Wed Mar 26 01:41:56 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev162.g3056dc5:
+ * exclude disabled services from the catalog
+ * refactor AuthCatalog tests
+ * Rename keystone.tests.fixtures
+ * Change the default version discovery URLs
+ * Remove extra cache layer debugging
+ * Fix doc build errors with SQLAlchemy 0.9
+ * Sync oslo-incubator db.sqlalchemy b9e2499
+ * Always include 'enabled' field in service response
+
+-------------------------------------------------------------------
+Tue Mar 25 01:41:45 UTC 2014 - [email protected]
+
+- Rebased patches:
+ + 0001-Create-TMPDIR-for-tests-recursively.patch dropped (merged upstream)
+
+-------------------------------------------------------------------
+Tue Mar 25 01:41:40 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev146.ge7b3005:
+ * Create TMPDIR for tests recursively
+ * test tcp_keepidle only if it's available on the current platform
+ * Add dedicated URL for issuing unscoped federation tokens
+
+-------------------------------------------------------------------
+Mon Mar 24 01:40:44 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev141.g0fb0dfd:
+ * Filter SAML2 assertion parameters with certain prefix
+
+-------------------------------------------------------------------
+Sun Mar 23 01:43:22 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev139.g1e84251:
+ * Use oslo db.sqlalchemy.session.EngineFacade.from_config
+
+-------------------------------------------------------------------
+Sat Mar 22 01:39:59 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev137.ga3c7553:
+ * Add support for parallel testr workers in Keystone
+ * is_revoked check all viable subtrees
+ * update sample conf
+ * explicitly import gettext function
+ * expires_at should be in a tuple not turned into one
+ * Comparisons should account for instantaneous test execution
+ * Make domain_id immutable by default
+ * Do not expose internal data on UnexpectedError
+ * Filter LDAP dumb member when listing role assignments
+
+-------------------------------------------------------------------
+Fri Mar 21 01:06:14 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev121.gff88763:
+ * Ability to turn off ldap referral chasing
+ * Add user_id when calling populate_roles_for_groups
+ * Store groups ids objects list in the OS-FEDERATION object
+ * Uses explicit imports for _
+ * Rename scope_to_bad_project() to test_scope_to_bad_project()
+ * Make LIVE Tests configurable with ENV
+
+-------------------------------------------------------------------
+Wed Mar 19 01:07:36 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev109.gd4574a7:
+ * Move test .conf files to keystone/tests/config_files
+ * Removal of test .conf files
+
+-------------------------------------------------------------------
+Tue Mar 18 10:29:57 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev105.gd906f57:
+ * Filter out nonstring environment variables before rules mapping
+ * Provide option to make domain_id immutable
+ * Replace httplib.HTTPSConnection in ec2_token
+ * Don't automatically enable revocation events
+ * Ensure v3policysample correctly limits domain_admin access
+ * Sync db, db.sqlalchemy from oslo-incubator 0a3436f
+ * Do not use keystone.conf.sample in tests
+ * Use class attribute to represent 'user' and 'group'
+ * trust creation allowed with empty roles list
+
+-------------------------------------------------------------------
+Sat Mar 15 01:10:23 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev88.gcd3b6f6:
+ * Update sample config
+ * remove hardcoded SQL queries in tests
+ * Fix db_version failed with wrong arguments
+
+-------------------------------------------------------------------
+Fri Mar 14 00:56:25 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev82.g358674a:
+ * Updated from global requirements
+ * Remove unnecessary oauth1.Manager constructions
+ * Enforce groups presence for federated authn
+ * Very minor cleanup to default_fixtures
+ * Cleanup keystoneclient tests
+ * Cleanup fixture data added to test instances
+ * Cleans up test data from limit tests
+ * Cleanup of instance attrs in core tests
+ * Cleanup backends after each test
+ * Fix include only enabled endpoints in catalog
+ * Add unit tests for disabled endpoints in catalog
+ * Add OS-OAUTH1 to consumers links section
+
+-------------------------------------------------------------------
+Thu Mar 13 01:26:10 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev58.gcb742d0:
+ * Fixup region description uniqueness
+
+-------------------------------------------------------------------
+Wed Mar 12 06:19:57 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev56.gbde896b:
+ * Add missing documentation for enabling oauth1 auth plugin
+ * Add missing documentation for enabling federation auth plugin
+ * Configurable temporary directory for tests
+ * Call an existing method in sync cache for revoke events
+ * Remove unnecessary calls to self.config()
+ * Import order is fixed
+
+-------------------------------------------------------------------
+Tue Mar 11 00:38:42 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev45.gfb8209e:
+ * Use config fixture
+
+-------------------------------------------------------------------
+Mon Mar 10 15:28:05 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev43.g58bb5e9:
+ * Fix docstrings in federation related modules
+ * Sync db, db.sqlalchemy, gettextutils from oslo-incubator 6ba44fd
+ * V3 xml responses should use v3 namespace
+ 2014.1.b3
+ * Update ADMIN_TOKEN description in docs
+ * Remove unused function from tests
+ * Don't need session.flush in context managed by session
+ * Remove vim headers
+ * Removes use of timeutils.set_time_override
+ * Removes a redundant test
+ * revocation_list only call isotime on datetime objects
+ * Handle exception messages with six.text_type
+ * Fix webob.exc.HTTPForbidden parameter miss
+
+-------------------------------------------------------------------
+Thu Mar 6 16:31:18 UTC 2014 - [email protected]
+
+- Fix requirements
+
+-------------------------------------------------------------------
+Thu Mar 6 16:20:17 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev515.g8c168bc:
+ * v3 endpoint create should require url
+
+-------------------------------------------------------------------
+Thu Mar 6 15:15:26 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev513.g7913636:
+ * Mark revoke as experimental
+ * Imported Translations from Transifex
+ * allow create credential with the system admin token
+ * Always include 'enabled' field in endpoint response
+ * Add the last of the outstanding helpstrings to config
+ * Update curl api example to specify tenant
+ * Update Oslo wiki link in README
+ * Lazy gettextutils behavior
+ * Update Oslo wiki link in README
+
+-------------------------------------------------------------------
+Thu Mar 6 00:55:38 UTC 2014 - [email protected]
+
++++ 291 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone-doc.changes
++++ and
/work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone-doc.changes
--- /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone.changes
2014-02-19 07:21:49.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone.changes
2014-04-14 10:55:04.000000000 +0200
@@ -2 +2 @@
-Thu Feb 13 16:10:02 UTC 2014 - [email protected]
+Wed Apr 9 16:57:38 UTC 2014 - [email protected]
@@ -4 +4,3 @@
-- Add 0001-Replacing-python-oauth2-by-oauthlib.patch, port from oauth2 to
oauthlib
+- Update to version keystone-2014.1.dev14.gb07840a:
+ * Updated from global requirements
+ * Fix invalid LDAP filter for user ID with comma
@@ -7 +9 @@
-Thu Feb 6 14:48:02 UTC 2014 - [email protected]
+Tue Apr 8 11:40:18 UTC 2014 - [email protected]
@@ -9 +11,23 @@
-- fix typo in logrotate
+- add 0001-Start-ping-listener-also-for-postgresql.patch
+
+-------------------------------------------------------------------
+Mon Apr 7 09:20:21 UTC 2014 - [email protected]
+
+- switch to icehouse branch once again
+
+-------------------------------------------------------------------
+Thu Mar 27 10:10:33 UTC 2014 - [email protected]
+
+- switch to icehouse branch again
+
+-------------------------------------------------------------------
+Thu Mar 27 01:40:23 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.2.dev176.g724d056:
+ * Open Juno development
+ * Enable lazy translations in httpd/keystone.py
+ * Avoid using .values() on the indexed columns
+ * Imported Translations from Transifex
+ * revert deprecation of v2 API
+ * Updated from global requirements
+ * Uses generator expressions instead of filter
@@ -12 +36,14 @@
-Mon Feb 03 09:23:24 UTC 2014 - [email protected]
+Wed Mar 26 01:41:59 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev162.g3056dc5:
+ * exclude disabled services from the catalog
+ * refactor AuthCatalog tests
+ * Rename keystone.tests.fixtures
+ * Change the default version discovery URLs
+ * Remove extra cache layer debugging
+ * Fix doc build errors with SQLAlchemy 0.9
+ * Sync oslo-incubator db.sqlalchemy b9e2499
+ * Always include 'enabled' field in service response
+
+-------------------------------------------------------------------
+Tue Mar 25 01:41:46 UTC 2014 - [email protected]
@@ -15 +52,2 @@
- + 0001-Adds-fixture-package-from-oslo.patch dropped (merged upstream)
+ + 0001-Create-TMPDIR-for-tests-recursively.patch dropped (merged upstream)
+ + 0001-Create-TMPDIR-for-tests-recursively.patch dropped (merged upstream)
@@ -18 +56 @@
-Mon Feb 3 09:23:22 UTC 2014 - [email protected]
+Tue Mar 25 01:41:44 UTC 2014 - [email protected]
@@ -20,6 +58,4 @@
-- Update to version 2013.2.2.dev19.g9056b66:
- + Remove roles from OS-TRUST list responses
- + Adds fixture package from oslo
- + Sync log_handler module from Oslo
- + Remove netifaces requirement
- + list_revoked_tokens sql speedup for havana
+- Update to version keystone-2014.1.dev146.ge7b3005:
+ * Create TMPDIR for tests recursively
+ * test tcp_keepidle only if it's available on the current platform
+ * Add dedicated URL for issuing unscoped federation tokens
@@ -28 +64 @@
-Mon Feb 3 09:21:42 UTC 2014 - [email protected]
+Mon Mar 24 17:51:47 UTC 2014 - [email protected]
@@ -30 +66 @@
-- remove 0001-list_revoked_tokens-sql-speedup-for-havana.patch
+- add 0001-Create-TMPDIR-for-tests-recursively.patch
@@ -33 +69 @@
-Sat Feb 1 01:24:47 UTC 2014 - [email protected]
+Mon Mar 24 01:40:47 UTC 2014 - [email protected]
@@ -35,4 +71,2 @@
-- Update to version 2013.2.2.dev9.g2724951:
- + Try decoding string to UTF-8 on error message fail
- + Have tox use pip upgrade when installing
- + Sync rpc fix from oslo-incubator
+- Update to version keystone-2014.1.dev141.g0fb0dfd:
+ * Filter SAML2 assertion parameters with certain prefix
@@ -41 +75 @@
-Fri Jan 31 01:37:29 UTC 2014 - [email protected]
+Sun Mar 23 01:43:25 UTC 2014 - [email protected]
@@ -43,2 +77,2 @@
-- Update to version 2013.2.2.dev3.gcecee8e:
- + Import strutils from oslo
+- Update to version keystone-2014.1.dev139.g1e84251:
+ * Use oslo db.sqlalchemy.session.EngineFacade.from_config
@@ -47 +81 @@
-Thu Jan 30 17:10:12 UTC 2014 - [email protected]
+Sat Mar 22 01:40:02 UTC 2014 - [email protected]
@@ -49,2 +83,188 @@
-- Set common name of example certs to FQDN to make then slightly more
- useful (bnc#855446)
+- Update to version keystone-2014.1.dev137.ga3c7553:
+ * Add support for parallel testr workers in Keystone
+ * is_revoked check all viable subtrees
+ * update sample conf
+ * explicitly import gettext function
+ * expires_at should be in a tuple not turned into one
+ * Comparisons should account for instantaneous test execution
+ * Make domain_id immutable by default
+ * Do not expose internal data on UnexpectedError
+ * Filter LDAP dumb member when listing role assignments
+
+-------------------------------------------------------------------
+Fri Mar 21 01:06:17 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev121.gff88763:
+ * Ability to turn off ldap referral chasing
+ * Add user_id when calling populate_roles_for_groups
+ * Store groups ids objects list in the OS-FEDERATION object
+ * Uses explicit imports for _
+ * Rename scope_to_bad_project() to test_scope_to_bad_project()
+ * Make LIVE Tests configurable with ENV
+
+-------------------------------------------------------------------
+Wed Mar 19 01:07:39 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev109.gd4574a7:
+ * Move test .conf files to keystone/tests/config_files
+ * Removal of test .conf files
+
+-------------------------------------------------------------------
+Tue Mar 18 10:29:59 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev105.gd906f57:
+ * Filter out nonstring environment variables before rules mapping
+ * Provide option to make domain_id immutable
+ * Replace httplib.HTTPSConnection in ec2_token
+ * Don't automatically enable revocation events
+ * Ensure v3policysample correctly limits domain_admin access
+ * Sync db, db.sqlalchemy from oslo-incubator 0a3436f
+ * Do not use keystone.conf.sample in tests
+ * Use class attribute to represent 'user' and 'group'
+ * trust creation allowed with empty roles list
+
+-------------------------------------------------------------------
+Mon Mar 17 10:06:26 UTC 2014 - [email protected]
+
+- switch over to non-openstack-prefix'ed users
+
+-------------------------------------------------------------------
+Sat Mar 15 01:10:27 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev88.gcd3b6f6:
+ * Update sample config
+ * remove hardcoded SQL queries in tests
+ * Fix db_version failed with wrong arguments
+
+-------------------------------------------------------------------
+Fri Mar 14 00:56:28 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev82.g358674a:
+ * Updated from global requirements
+ * Remove unnecessary oauth1.Manager constructions
+ * Enforce groups presence for federated authn
+ * Very minor cleanup to default_fixtures
+ * Cleanup keystoneclient tests
+ * Cleanup fixture data added to test instances
+ * Cleans up test data from limit tests
+ * Cleanup of instance attrs in core tests
+ * Cleanup backends after each test
+ * Fix include only enabled endpoints in catalog
+ * Add unit tests for disabled endpoints in catalog
+ * Add OS-OAUTH1 to consumers links section
+
+-------------------------------------------------------------------
+Thu Mar 13 01:26:13 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev58.gcb742d0:
+ * Fixup region description uniqueness
+
+-------------------------------------------------------------------
+Wed Mar 12 06:20:00 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev56.gbde896b:
+ * Add missing documentation for enabling oauth1 auth plugin
+ * Add missing documentation for enabling federation auth plugin
+ * Configurable temporary directory for tests
+ * Call an existing method in sync cache for revoke events
+ * Remove unnecessary calls to self.config()
+ * Import order is fixed
+
+-------------------------------------------------------------------
+Tue Mar 11 00:38:46 UTC 2014 - [email protected]
+
+- Update to version keystone-2014.1.dev45.gfb8209e:
+ * Use config fixture
+
+-------------------------------------------------------------------
+Mon Mar 10 15:28:08 UTC 2014 - [email protected]
++++ 1083 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone.changes
++++ and
/work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone.changes
Old:
----
0001-Replacing-python-oauth2-by-oauthlib.patch
keystone-stable-havana.tar.gz
New:
----
0001-Start-ping-listener-also-for-postgresql.patch
keystone-2014.1.rc2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-keystone-doc.spec ++++++
--- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200
+++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200
@@ -19,18 +19,26 @@
%define component keystone
Name: openstack-%{component}-doc
-Version: 2013.2.2.dev20.gc22f2ed
+Version: 2014.1.rc2
Release: 0
Summary: OpenStack Identity Service (Keystone) - Documentation
License: Apache-2.0
Group: Documentation/HTML
Url: https://github.com/openstack/keystone
-Source: keystone-stable-havana.tar.gz
+Source:
http://tarballs.openstack.org/keystone/keystone-%{version}.tar.gz
+BuildRequires: openstack-keystone
BuildRequires: openstack-suse-macros
BuildRequires: python-Sphinx
-BuildRequires: python-base
-BuildRequires: python-oslo.sphinx
-BuildRequires: python-pbr
+BuildRequires: python-WebTest
+BuildRequires: python-fixtures
+BuildRequires: python-lockfile
+BuildRequires: python-mock
+BuildRequires: python-mox
+BuildRequires: python-oslo.messaging
+BuildRequires: python-oslosphinx
+BuildRequires: python-pycadf
+BuildRequires: python-testscenarios
+BuildRequires: python-testtools
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,7 +50,7 @@
This package contains documentation files for openstack-keystone.
%prep
-%setup -q -n keystone-2013.2.2.dev20.gc22f2ed
+%setup -q -n keystone-%{version}
%openstack_cleanup_prep
%build
++++++ openstack-keystone.spec ++++++
--- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200
+++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200
@@ -17,49 +17,67 @@
%define component keystone
-%define groupname openstack-%{component}
-%define username openstack-%{component}
+%define groupname %{component}
+%define username %{component}
Name: openstack-%{component}
-Version: 2013.2.2.dev20.gc22f2ed
+Version: 2014.1.rc2
Release: 0
Summary: OpenStack Identity Service (Keystone)
License: Apache-2.0
Group: Development/Languages/Python
Url: https://github.com/openstack/keystone
-Source: keystone-stable-havana.tar.gz
+Source:
http://tarballs.openstack.org/keystone/keystone-%{version}.tar.gz
Source1: %{name}.init
Source2: logging.conf
Source7: %{name}.logrotate
-# PATCH-FIX-UPSTREAM [email protected] --
https://review.openstack.org/#/c/70750/
-Patch0: 0001-Replacing-python-oauth2-by-oauthlib.patch
+Patch0: 0001-Start-ping-listener-also-for-postgresql.patch
BuildRequires: crudini
BuildRequires: openstack-suse-macros
-BuildRequires: python-Babel
+BuildRequires: python-Paste
+BuildRequires: python-PasteDeploy >= 1.5.0
+BuildRequires: python-WebTest >= 2.0
BuildRequires: python-base
-BuildRequires: python-netaddr
-BuildRequires: python-oslo.config
-BuildRequires: python-oslo.sphinx
-BuildRequires: python-pbr
-BuildRequires: python-setuptools
+BuildRequires: python-fixtures >= 0.3.14
+BuildRequires: python-jsonschema >= 2.0.0
+BuildRequires: python-keystoneclient >= 0.6.0
+BuildRequires: python-ldap
+BuildRequires: python-lockfile >= 0.8
+BuildRequires: python-lxml >= 2.3
+BuildRequires: python-mock >= 1.0
+BuildRequires: python-mox >= 0.5.3
+BuildRequires: python-netaddr >= 0.7.6
+BuildRequires: python-oauthlib >= 0.6
+BuildRequires: python-oslo.config >= 1.2.0
+BuildRequires: python-oslo.messaging >= 1.3.0a4
+BuildRequires: python-pam >= 0.1.4
+BuildRequires: python-pbr >= 0.6
+BuildRequires: python-pycadf >= 0.1.9
+BuildRequires: python-testscenarios >= 0.4
+BuildRequires: python-testtools >= 0.9.34
# Needed for %%post section keystone-manage invocation:
-BuildRequires: python-WebOb
+BuildRequires: python-WebOb >= 1.2.3
BuildRequires: python-passlib
-BuildRequires: python-routes
# Documentation build requirements:
+BuildRequires: python-Babel >= 1.3
BuildRequires: python-Sphinx
+BuildRequires: python-oslosphinx
Requires: logrotate
-Requires: python-argparse
-Requires: python-iso8601 >= 0.1.8
+Requires: python-iso8601 >= 0.1.9
Requires: python-keystone = %{version}
Requires: python-oslo.config >= 1.2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# keystone dependencies
# To generate a self-signed certificate to be used in demo setups:
Requires(post): coreutils
+Requires(post): crudini
Requires(post): python-keystone
-Requires(post): python-dogpile.cache
+Requires(post): python-dogpile.cache >= 0.5.0
Requires(post): python-argparse
-Requires(post): python-iso8601
+Requires(post): python-iso8601 >= 0.1.8
+# NOTE(saschp): We need OpenStack'S fork here:
+Requires(post): python-sqlalchemy-migrate >= 0.8.2
+Requires(post): python-Routes >= 1.12.3
Requires(post): openssl
Requires(post): sysconfig
Requires(pre): pwdutils
@@ -87,20 +105,23 @@
Requires: python-dogpile.cache >= 0.5.0
Requires: python-eventlet >= 0.13.0
Requires: python-greenlet >= 0.3.2
-Requires: python-iso8601 >= 0.1.8
-Requires: python-keystoneclient >= 0.3.2
-Requires: python-ldap
+Requires: python-iso8601 >= 0.1.9
+Requires: python-jsonschema >= 2.0.0
+Requires: python-keystoneclient >= 0.7.0
+Requires: python-kombu >= 2.4.8
+Requires: python-ldap >= 2.3.13
+Requires: python-lockfile >= 0.8
Requires: python-lxml >= 2.3
-Requires: python-netaddr
+Requires: python-netaddr >= 0.7.6
Requires: python-oauthlib >= 0.6
+Requires: python-oslo.messaging >= 1.3.0a9
Requires: python-pam >= 0.1.4
Requires: python-passlib
-Requires: python-pbr >= 0.5.21
-Requires: python-routes >= 1.12.3
-Requires: python-sqlalchemy >= 0.7.8
-BuildRequires: python-sqlalchemy >= 0.7.8
-Requires: python-sqlalchemy-migrate >= 0.7.2
-BuildRequires: python-sqlalchemy-migrate >= 0.7.2
+Requires: python-pbr >= 0.6
+Requires: python-pycadf >= 0.4.1
+Requires: python-six >= 1.5.2
+Requires: python-sqlalchemy-migrate >= 0.8.2
+Requires: python-stevedore >= 0.14
%description -n python-keystone
Keystone is an OpenStack project that provides Identity, Token, Catalog
@@ -113,25 +134,22 @@
Summary: Testsuite for the OpenStack Keystone
Group: Development/Languages/Python
Requires: %{name} = %{version}
-Requires: python-Sphinx >= 1.1.2
Requires: python-WebTest >= 2.0
-Requires: python-coverage >= 3.6
-Requires: python-flake8 >= 2.0
-Requires: python-hacking >= 0.5.6
-Requires: python-keystoneclient >= 0.3.2
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+Requires: python-discover
+%endif
+Requires: python-fixtures >= 0.3.14
+Requires: python-keystoneclient >= 0.7.0
+Requires: python-mock >= 1.0
Requires: python-mox >= 0.5.3
-Requires: python-netifaces >= 0.5
-Requires: python-nose
-Requires: python-nosehtmloutput >= 0.0.3
-Requires: python-nosexcover
-Requires: python-openstack.nose_plugin >= 0.7
-Requires: python-pep8 >= 1.4.5
-Requires: python-pyflakes >= 0.7.2
+Requires: python-pysqlite
Requires: python-python-memcached >= 1.48
+Requires: python-python-subunit >= 0.0.18
Requires: python-requests >= 1.1
Requires: python-swift
-Requires: python-testtools >= 0.9.32
-Requires: python-unittest2
+Requires: python-testrepository >= 0.0.18
+Requires: python-testscenarios >= 0.4
+Requires: python-testtools >= 0.9.34
# checkout_vendor in ./keystone/test.py
Requires: git-core
@@ -140,13 +158,13 @@
functionality of OpenStack Keystone.
%prep
-%setup -q -n keystone-2013.2.2.dev20.gc22f2ed
-%patch0 -p1
+%setup -q -n %{component}-%{version}
+%patch0
%openstack_cleanup_prep
%build
python setup.py build
-python setup.py build_sphinx -b man
+sphinx-build -b man doc/source doc/build/man
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
@@ -166,7 +184,7 @@
mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly/
cat - > %{buildroot}%{_sysconfdir}/cron.hourly/%name <<EOF
#!/bin/bash
-su openstack-keystone -s /bin/bash -c "/usr/bin/keystone-manage --config-file
/etc/keystone/keystone.conf token_flush" || :
+su %{username} -s /bin/bash -c "/usr/bin/keystone-manage --config-file
/etc/keystone/keystone.conf token_flush" || :
EOF
### init scripts
@@ -184,13 +202,8 @@
# the tests and we want to keep it out of /usr/lib/
# https://review.openstack.org/#q,I9b02a5273dd27db963e9a26085b7456f4c5f6a41,n,z
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}-test/tmp
-sed -i -e "s/TMPDIR = .*/TMPDIR = os.path.join(ROOTDIR, 'tmp')/"
%{buildroot}%{python_sitelib}/%{component}/tests/core.py
ln -s %{_localstatedir}/lib/%{name}-test/tmp
%{buildroot}%{python_sitelib}/%{component}/tests/tmp
-# Allow the unittests to find the signing certs
-%define keystone_test_overrides
%{buildroot}%{python_sitelib}/%{component}/tests/test_overrides.conf
-crudini --set %{keystone_test_overrides} signing certfile
%{_localstatedir}/lib/%{name}-test/examples/pki/certs/signing_cert.pem
-crudini --set %{keystone_test_overrides} signing keyfile
%{_localstatedir}/lib/%{name}-test/examples/pki/private/signing_key.pem
-crudini --set %{keystone_test_overrides} signing ca_certs
%{_localstatedir}/lib/%{name}-test/examples/pki/certs/cacert.pem
+sed -i -e "s/TMPDIR = .*/TMPDIR = os.path.join(ROOTDIR, 'tmp')/"
%{buildroot}%{python_sitelib}/%{component}/tests/core.py
### create keystone ssl dirs
install -d %{buildroot}%{_sysconfdir}/keystone/ssl/private
@@ -201,22 +214,17 @@
### set default configuration (mostly applies to package-only setups and
quickstart, i.e. not generally crowbar)
%define keystone_conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf
crudini --set %{keystone_conf} DEFAULT verbose True
-crudini --set %{keystone_conf} DEFAULT log_file keystone.log
crudini --set %{keystone_conf} DEFAULT log_dir /var/log/keystone
crudini --set %{keystone_conf} catalog driver
keystone.catalog.backends.sql.Catalog
#TODO/FIXME(saschpe): Do we want to use sqlite per default or demand
PostgreSQL right away?
crudini --set %{keystone_conf} sql connection
sqlite:////var/lib/keystone/keystone.db
%pre
-getent group %{groupname} >/dev/null || groupadd -r %{groupname}
-getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d
%{_localstatedir}/lib/keystone -s /sbin/nologin -c "OpenStack keystone Daemon"
%{username}
-exit 0
+%openstack_pre_user_group_create %{username} %{groupname}
%post
-if [ $1 -eq 1 ] ; then
- %define keystone_conf %{_sysconfdir}/keystone/keystone.conf
- crudini --set %{keystone_conf} signing cert_subject
/C=US/ST=Unset/L=Unset/O=Unset/CN=$(hostname -f) || :
-fi
+%define keystone_conf %{_sysconfdir}/keystone/keystone.conf
+crudini --set %{keystone_conf} signing cert_subject
/C=US/ST=Unset/L=Unset/O=Unset/CN=$(hostname -f)
# create an example.com certificate if not available already
if ! [ -r /etc/keystone/ssl/certs/signing_cert.pem ]; then
if [ -r /etc/keystone/ssl/certs/index.txt ]; then
@@ -227,7 +235,9 @@
fi
/usr/bin/keystone-manage pki_setup --keystone-user %{username}
--keystone-group %{groupname}
# keystone-manage will create a keystone.log file owned by root; fix that
- test -f %{_localstatedir}/log/keystone/keystone.log && chown
%{username}:%{groupname} %{_localstatedir}/log/keystone/keystone.log
+ test -f %{_localstatedir}/log/keystone/keystone-manage.log && {
+ chown %{username}:%{groupname}
%{_localstatedir}/log/keystone/keystone-manage.log
+ }
fi
%fillup_and_insserv %{name}
%restart_on_update %{name}
++++++ 0001-Start-ping-listener-also-for-postgresql.patch ++++++
--- keystone/openstack/common/db/sqlalchemy/session.py
+++ keystone/openstack/common/db/sqlalchemy/session.py
@@ -367,7 +367,7 @@
return [columns]
return columns[len(uniqbase):].split("0")[1:]
- if engine_name not in ["ibm_db_sa", "mysql", "sqlite", "postgresql"]:
+ if engine_name not in ("ibm_db_sa", "mysql", "sqlite", "postgresql"):
return
# FIXME(johannes): The usage of the .message attribute has been
@@ -489,7 +489,7 @@
def _ping_listener(engine, dbapi_conn, connection_rec, connection_proxy):
- """Ensures that MySQL and DB2 connections are alive.
+ """Ensures that MySQL, PostgreSQL or DB2 connections are alive.
Borrowed from:
http://groups.google.com/group/sqlalchemy/msg/a4ce563d802c929f
@@ -645,7 +645,7 @@
sqlalchemy.event.listen(engine, 'checkin', _thread_yield)
- if engine.name in ['mysql', 'ibm_db_sa']:
+ if engine.name in ('ibm_db_sa', 'mysql', 'postgresql'):
ping_callback = functools.partial(_ping_listener, engine)
sqlalchemy.event.listen(engine, 'checkout', ping_callback)
if engine.name == 'mysql':
++++++ _service ++++++
--- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200
+++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200
@@ -1,10 +1,12 @@
<services>
- <service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/keystone/keystone-stable-havana.tar.gz</param>
- <param name="email">[email protected]</param>
- <param name="plain-version">True</param>
+ <service mode="disabled" name="download_files">
+ <param name="changesgenerate">enable</param>
+ </service>
+ <service mode="disabled" name="set_version">
+ <param name="basename">keystone</param>
+ </service>
+ <service mode="disabled" name="python_requires">
</service>
-
<service name="refresh_patches" mode="disabled">
<param name="changesgenerate">enable</param>
</service>
++++++ openstack-keystone.init ++++++
--- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200
+++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200
@@ -12,7 +12,7 @@
# Description: OpenStack Identity (Keystone)
### END INIT INFO
-USER="openstack-keystone"
+USER="keystone"
CONFFILE="/etc/keystone/keystone.conf"
RUNDIR="/var/run/keystone"
++++++ openstack-keystone.logrotate ++++++
--- /var/tmp/diff_new_pack.sNBelQ/_old 2014-04-14 10:55:05.000000000 +0200
+++ /var/tmp/diff_new_pack.sNBelQ/_new 2014-04-14 10:55:05.000000000 +0200
@@ -7,7 +7,7 @@
dateext
missingok
notifempty
- su openstack-keystone openstack-keystone
+ su keystone keystone
copytruncate
sharedscripts
}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
