Hello community,
here is the log from the commit of package openstack-keystone for
openSUSE:Factory checked in at 2014-01-20 07:06:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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.changes
2013-10-18 19:23:20.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone.changes
2014-01-23 15:50:38.000000000 +0100
@@ -1,0 +2,80 @@
+Thu Jan 9 08:25:46 UTC 2014 - [email protected]
+
+- Move to DB-based endpoint catalog. Avoids running out of sync with
+ upstream changes in the default_catalog.template.sample file and
+ allows to manipulate via 'keystone' CLI tool.
+
+-------------------------------------------------------------------
+Thu Jan 2 10:51:38 UTC 2014 - [email protected]
+
+- remove 0001-Restore-ability-to-create-EC2-tokens-as-admin.patch
+
+-------------------------------------------------------------------
+Mon Dec 23 23:58:50 UTC 2013 - [email protected]
+
+- add 0001-Restore-ability-to-create-EC2-tokens-as-admin.patch
+
+-------------------------------------------------------------------
+Tue Dec 17 00:44:37 UTC 2013 - [email protected]
+
+- Update to version 2013.2.2.dev1.g0d83e7e:
+ + Bump stable/havana next version to 2013.2.2
+
+-------------------------------------------------------------------
+Mon Dec 16 09:28:52 UTC 2013 - [email protected]
+
+- fix requires
+
+-------------------------------------------------------------------
+Sun Dec 15 01:02:20 UTC 2013 - [email protected]
+
+- Update to version 2013.2.1.dev8.g03ed8c3:
+ + Fix issues handling trust tokens via ec2tokens API
+
+-------------------------------------------------------------------
+Sat Dec 14 00:46:13 UTC 2013 - [email protected]
+
+- Update to version 2013.2.1.dev6.g64ac189:
+ + Updated from global requirements
+
+-------------------------------------------------------------------
+Mon Dec 9 12:46:14 UTC 2013 - [email protected]
+
+- Drop 0001-Make-ROOTDIR-determination-more-robust.patch: Solved
+ slightly different upstream
+- Update to version 2013.2.1.dev5.gd927273:
+ + Fix Rootdir determination
+
+-------------------------------------------------------------------
+Sat Dec 7 00:40:23 UTC 2013 - [email protected]
+
+- Update to version 2013.2.1.dev3.g3c25be5:
+ + Update memcache to match global requirements for stable/havana
+
+-------------------------------------------------------------------
+Wed Oct 30 17:20:31 UTC 2013 - [email protected]
+
+- Add %{python_sitelib}/keystone/tests/tmp symlink to the -test
+ subpackage allow the unittests to create/locate their database
+- Adapt test configuration for the correct location of the example
+ certificates. (Using relative paths doesn't work with our -test
+ package layout)
+
+-------------------------------------------------------------------
+Tue Oct 29 14:07:44 UTC 2013 - [email protected]
+
+- Update to version 2013.2.1.dev2.g4221b60:
+ + Fix remove role assignment adds role using LDAP assignment
+
+-------------------------------------------------------------------
+Wed Oct 23 16:07:05 UTC 2013 - [email protected]
+
+- Move default tests TMPDIR location to
+ /var/lib/openstack-keystone-test/tmp
+
+-------------------------------------------------------------------
+Tue Oct 22 14:44:28 UTC 2013 - [email protected]
+
+- Add python-testtools dependency for test package
+
+-------------------------------------------------------------------
Old:
----
0001-Make-ROOTDIR-determination-more-robust.patch
default_catalog.templates
keystone-2013.2.tar.gz
New:
----
keystone-stable-havana.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-keystone-doc.spec ++++++
--- /var/tmp/diff_new_pack.YjRl2e/_old 2014-01-23 15:50:38.000000000 +0100
+++ /var/tmp/diff_new_pack.YjRl2e/_new 2014-01-23 15:50:38.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openstack-keystone-doc
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
%define component keystone
Name: openstack-%{component}-doc
-Version: 2013.2
+Version: 2013.2.2.dev1.g0d83e7e
Release: 0
Summary: OpenStack Identity Service (Keystone) - Documentation
License: Apache-2.0
Group: Documentation/HTML
Url: https://github.com/openstack/keystone
-Source: keystone-2013.2.tar.gz
+Source: keystone-stable-havana.tar.gz
BuildRequires: openstack-suse-macros
BuildRequires: python-Sphinx
BuildRequires: python-base
@@ -43,7 +43,7 @@
This package contains documentation files for openstack-keystone.
%prep
-%setup -q -n keystone-2013.2
+%setup -q -n keystone-2013.2.2.dev1.g0d83e7e
%openstack_cleanup_prep
%build
++++++ openstack-keystone.spec ++++++
--- /var/tmp/diff_new_pack.YjRl2e/_old 2014-01-23 15:50:38.000000000 +0100
+++ /var/tmp/diff_new_pack.YjRl2e/_new 2014-01-23 15:50:38.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openstack-keystone
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,18 +21,16 @@
%define username openstack-%{component}
Name: openstack-%{component}
-Version: 2013.2
+Version: 2013.2.2.dev1.g0d83e7e
Release: 0
Summary: OpenStack Identity Service (Keystone)
License: Apache-2.0
Group: Development/Languages/Python
Url: https://github.com/openstack/keystone
-Source: keystone-2013.2.tar.gz
+Source: keystone-stable-havana.tar.gz
Source1: %{name}.init
Source2: logging.conf
-Source3: default_catalog.templates
Source7: %{name}.logrotate
-Patch0: 0001-Make-ROOTDIR-determination-more-robust.patch
BuildRequires: crudini
BuildRequires: openstack-suse-macros
BuildRequires: python-Babel
@@ -50,7 +48,7 @@
BuildRequires: python-Sphinx
Requires: logrotate
Requires: python-argparse
-Requires: python-iso8601 >= 0.1.4
+Requires: python-iso8601 >= 0.1.8
Requires: python-keystone = %{version}
Requires: python-oslo.config >= 1.2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,25 +76,25 @@
Summary: OpenStack Identity Service (Keystone) - Python module
Group: Development/Languages/Python
Requires: python >= 2.6.8
-Requires: python-Babel >= 1.1
+Requires: python-Babel >= 1.3
Requires: python-Paste
-Requires: python-PasteDeploy
-Requires: python-Routes
+Requires: python-PasteDeploy >= 1.5.0
+Requires: python-Routes >= 1.12.3
Requires: python-SQLAlchemy >= 0.7.8
-Requires: python-WebOb >= 1.0.8
+Requires: python-WebOb >= 1.2.3
Requires: python-dogpile.cache >= 0.5.0
-Requires: python-eventlet >= 0.9.12
-Requires: python-greenlet
-Requires: python-iso8601 >= 0.1.4
-Requires: python-keystoneclient >= 0.3.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-lxml
+Requires: python-lxml >= 2.3
Requires: python-netaddr
Requires: python-oauth2
Requires: python-pam >= 0.1.4
Requires: python-passlib
-Requires: python-pbr >= 0.5
-Requires: python-routes
+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
@@ -114,22 +112,23 @@
Group: Development/Languages/Python
Requires: %{name} = %{version}
Requires: python-Sphinx >= 1.1.2
-Requires: python-WebTest
-Requires: python-coverage
+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.0
-Requires: python-mox
-Requires: python-netifaces
+Requires: python-keystoneclient >= 0.3.2
+Requires: python-mox >= 0.5.3
+Requires: python-netifaces >= 0.5
Requires: python-nose
-Requires: python-nosehtmloutput
+Requires: python-nosehtmloutput >= 0.0.3
Requires: python-nosexcover
-Requires: python-openstack.nose_plugin
+Requires: python-openstack.nose_plugin >= 0.7
Requires: python-pep8 >= 1.4.5
Requires: python-pyflakes >= 0.7.2
-Requires: python-python-memcached
-Requires: python-requests >= 1.0.0
+Requires: python-python-memcached >= 1.48
+Requires: python-requests >= 1.1
Requires: python-swift
+Requires: python-testtools >= 0.9.32
Requires: python-unittest2
# checkout_vendor in ./keystone/test.py
Requires: git-core
@@ -139,8 +138,7 @@
functionality of OpenStack Keystone.
%prep
-%setup -q -n keystone-2013.2
-%patch0 -p1
+%setup -q -n keystone-2013.2.2.dev1.g0d83e7e
%openstack_cleanup_prep
%build
@@ -156,7 +154,6 @@
### configuration files
install -d -m 0755 %{buildroot}%{_sysconfdir}/keystone
cp %{SOURCE2} %{buildroot}%{_sysconfdir}/keystone/
-cp %{SOURCE3}
%{buildroot}%{_sysconfdir}/keystone/default_catalog.templates.sample
cp etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf
cp etc/keystone-paste.ini %{buildroot}%{_sysconfdir}/keystone/
cp etc/policy.json %{buildroot}%{_sysconfdir}/keystone/
@@ -173,6 +170,17 @@
### test subpackage
%openstack_test_package_install
+# upstream does not distribute this directory, but it is required for
+# 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
### create keystone ssl dirs
install -d %{buildroot}%{_sysconfdir}/keystone/ssl/private
@@ -185,9 +193,7 @@
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
-#TODO/FIXME(saschpe): Do we really want to use the file-based catalog or move
into DB by default?
-crudini --set %{keystone_conf} catalog template_file
/etc/keystone/default_catalog.templates
-crudini --set %{keystone_conf} catalog driver
keystone.catalog.backends.templated.TemplatedCatalog
+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
@@ -235,7 +241,6 @@
%config %{_sysconfdir}/%{component}/keystone-paste.ini
%config %{_sysconfdir}/%{component}/policy.json
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%attr(0640, %{username}, %{groupname})
%{_sysconfdir}/%{component}/default_catalog.templates.sample
%{_initddir}/%{name}
%{_sbindir}/rc%{name}
%{_bindir}/keystone-all
@@ -246,10 +251,12 @@
%files -n python-keystone
%defattr(-,root,root,-)
%doc LICENSE
+%exclude %{python_sitelib}/%{component}/tests/tmp
%{python_sitelib}
%files test
%defattr(-,root,root)
%{_localstatedir}/lib/openstack-%{component}-test
+%{python_sitelib}/%{component}/tests/tmp
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.YjRl2e/_old 2014-01-23 15:50:38.000000000 +0100
+++ /var/tmp/diff_new_pack.YjRl2e/_new 2014-01-23 15:50:38.000000000 +0100
@@ -1,6 +1,6 @@
<services>
<service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/keystone/keystone-2013.2.tar.gz</param>
+ <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>
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
