[openstack-keystone] icehouse-3 milestone
Alan Pevec
apevec at fedoraproject.org
Fri Mar 7 14:10:57 UTC 2014
commit 05be3cbc76cb20f923ececde1c265bdf6ce6c838
Author: Alan Pevec <apevec at redhat.com>
Date: Fri Mar 7 14:32:45 2014 +0100
icehouse-3 milestone
.gitignore | 1 +
0001-remove-runtime-dep-on-python-pbr.patch | 45 +++++-----
...-parameter-values-with-keystone-dist.conf.patch | 90 +++++++++++---------
keystone-dist.conf | 27 ++----
openstack-keystone.spec | 20 +++--
sources | 2 +-
6 files changed, 95 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b88b81..3ed9dc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/keystone-2013.2.tar.gz
/keystone-2014.1.b1.tar.gz
/keystone-2014.1.b2.tar.gz
+/keystone-2014.1.b3.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 51e189e..4e4cd65 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 53260428c1b1de6d349f094f6fde7352e03b8944 Mon Sep 17 00:00:00 2001
+From 35ac7b2b37a7f3466b07cf45cc007e789934625d Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 9 Sep 2013 00:38:42 +0200
Subject: [PATCH] remove runtime dep on python-pbr
@@ -6,14 +6,14 @@ Subject: [PATCH] remove runtime dep on python-pbr
---
bin/keystone-all | 3 +--
keystone/cli.py | 3 +--
- requirements.txt | 27 +--------------------------
- 3 files changed, 3 insertions(+), 30 deletions(-)
+ requirements.txt | 24 +-----------------------
+ 3 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/bin/keystone-all b/bin/keystone-all
-index 66d1ccc..c1cef5c 100755
+index ffe6867..ff6f3f4 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
-@@ -33,7 +33,6 @@ if os.path.exists(os.path.join(possible_topdir,
+@@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir,
from paste import deploy
@@ -21,8 +21,8 @@ index 66d1ccc..c1cef5c 100755
from keystone.openstack.common import gettextutils
-@@ -106,7 +105,7 @@ if __name__ == '__main__':
- sql.initialize()
+@@ -109,7 +108,7 @@ if __name__ == '__main__':
+ config.set_default_for_default_log_levels()
CONF(project='keystone',
- version=pbr.version.VersionInfo('keystone').version_string(),
@@ -31,18 +31,18 @@ index 66d1ccc..c1cef5c 100755
config.setup_logging()
diff --git a/keystone/cli.py b/keystone/cli.py
-index 514e0d7..290ca0a 100644
+index a9decbd..9411219 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
-@@ -21,7 +21,6 @@ import os
- from migrate import exceptions
+@@ -17,7 +17,6 @@ from __future__ import absolute_import
+ import os
from oslo.config import cfg
-import pbr.version
from keystone.common import openssl
from keystone.common import sql
-@@ -216,7 +215,7 @@ def main(argv=None, config_files=None):
+@@ -184,7 +183,7 @@ def main(argv=None, config_files=None):
CONF(args=argv[1:],
project='keystone',
@@ -52,14 +52,14 @@ index 514e0d7..290ca0a 100644
default_config_files=config_files)
config.setup_logging()
diff --git a/requirements.txt b/requirements.txt
-index 472a949..e975d85 100644
+index 1306058..e975d85 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -1,27 +1,2 @@
+@@ -1,24 +1,2 @@
# keystone dependencies
--pbr>=0.5.21,<1.0
+-pbr>=0.6,<1.0
-pam>=0.1.4
--WebOb>=1.2.3,<1.3
+-WebOb>=1.2.3
-eventlet>=0.13.0
-greenlet>=0.3.2
-netaddr>=0.7.6
@@ -67,20 +67,17 @@ index 472a949..e975d85 100644
-Paste
-Routes>=1.12.3
-six>=1.4.1
--SQLAlchemy>=0.7.8,<=0.7.99
+-SQLAlchemy>=0.7.8,<=0.8.99
-sqlalchemy-migrate>=0.8.2
-passlib
-lxml>=2.3
-iso8601>=0.1.8
--python-keystoneclient>=0.4.1
+-python-keystoneclient>=0.6.0
-oslo.config>=1.2.0
+-oslo.messaging>=1.3.0a4
-Babel>=1.3
--oauthlib
+-oauthlib>=0.6
-dogpile.cache>=0.5.0
--
--# KDS exclusive dependencies
--
--pecan>=0.2.0
--pycrypto>=2.6
--WSME>=0.5b6
+-jsonschema>=2.0.0,<3.0.0
+-pycadf>=0.1.9
+# let RPM handle deps
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index f85fdab..9447e9c 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,55 +1,67 @@
-From c00bd925ca2811f6b9c945f29be5cf5265208b72 Mon Sep 17 00:00:00 2001
+From 07bd99ba9ae89b31bba161bd1e711855d1864b5b Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 9 Sep 2013 15:22:20 +0200
Subject: [PATCH] sync parameter values with keystone-dist.conf
---
- etc/keystone.conf.sample | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ etc/keystone.conf.sample | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index ce77397..d07eee5 100644
+index c45c84b..735505c 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
-@@ -62,7 +62,7 @@
- # verbose = False
+@@ -280,7 +280,7 @@
- # Name of log file to output to. If not set, logging will go to stdout.
--# log_file = keystone.log
-+# log_file = /var/log/keystone/keystone.log
+ # The messaging driver to use, defaults to rabbit. Other
+ # drivers include qpid and zmq. (string value)
+-#rpc_backend=rabbit
++#rpc_backend=qpid
- # The directory to keep log files in (will be prepended to --logfile)
- # log_dir = /var/log/keystone
-@@ -163,7 +163,7 @@
+ # The default exchange under which topics are scoped. May be
+ # overridden by an exchange name specified in the
+@@ -412,7 +412,7 @@
+ # (Optional) Name of log file to output to. If no default is
+ # set, logging will go to stdout. (string value)
+ # Deprecated group/name - [DEFAULT]/logfile
+-#log_file=<None>
++#log_file=/var/log/keystone/keystone.log
- [database]
- # The SQLAlchemy connection string used to connect to the database
--# connection = sqlite:///keystone.db
-+# connection = mysql://keystone:keystone@localhost/keystone
+ # (Optional) The base directory used for relative --log-file
+ # paths (string value)
+@@ -551,7 +551,7 @@
- # The SQLAlchemy connection string used to connect to the slave database
- # Note that Keystone does not use this option.
-@@ -239,7 +239,7 @@
- # static, file-based backend (does *NOT* support any management commands)
- # driver = keystone.catalog.backends.templated.TemplatedCatalog
+ # Catalog template file name for use with the template catalog
+ # backend. (string value)
+-#template_file=default_catalog.templates
++#template_file=/etc/keystone/default_catalog.templates
+
+ # Keystone catalog backend driver (string value)
+ #driver=keystone.catalog.backends.sql.Catalog
+@@ -591,7 +591,7 @@
+ # Deprecated group/name - [DEFAULT]/sql_connection
+ # Deprecated group/name - [DATABASE]/sql_connection
+ # Deprecated group/name - [sql]/connection
+-#connection=sqlite:////keystone/openstack/common/db/$sqlite_db
++#connection=mysql://keystone:keystone@localhost/keystone
+
+ # The SQLAlchemy connection string used to connect to the
+ # slave database (string value)
+@@ -657,7 +657,7 @@
+ #
+
+ # Keystone EC2Credential backend driver (string value)
+-#driver=keystone.contrib.ec2.backends.kvs.Ec2
++#driver=keystone.contrib.ec2.backends.sql.Ec2
--# template_file = default_catalog.templates
-+# template_file = /etc/keystone/default_catalog.templates
[endpoint_filter]
- # extension for creating associations between project and endpoints in order to
-@@ -322,7 +322,7 @@
- # driver = keystone.policy.backends.sql.Policy
-
- [ec2]
--# driver = keystone.contrib.ec2.backends.kvs.Ec2
-+# driver = keystone.contrib.ec2.backends.sql.Ec2
-
- [assignment]
- # driver =
-@@ -488,4 +488,4 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
-
- [paste_deploy]
- # Name of the paste configuration file that defines the available pipelines
--config_file = keystone-paste.ini
-+# config_file = /usr/share/keystone/keystone-dist-paste.ini
+@@ -1066,7 +1066,7 @@
+
+ # Name of the paste configuration file that defines the
+ # available pipelines (string value)
+-#config_file=keystone-paste.ini
++#config_file=/usr/share/keystone/keystone-dist-paste.ini
+
+
+ [policy]
diff --git a/keystone-dist.conf b/keystone-dist.conf
index c337055..dca5fe8 100644
--- a/keystone-dist.conf
+++ b/keystone-dist.conf
@@ -1,30 +1,23 @@
[DEFAULT]
-log_file = /var/log/keystone/keystone.log
-onready = keystone.common.systemd
+log_file=/var/log/keystone/keystone.log
+onready=keystone.common.systemd
+rpc_backend=qpid
[database]
-connection = mysql://keystone:keystone@localhost/keystone
+connection=mysql://keystone:keystone@localhost/keystone
[identity]
-driver = keystone.identity.backends.sql.Identity
+driver=keystone.identity.backends.sql.Identity
[catalog]
-driver = keystone.catalog.backends.sql.Catalog
-template_file = /etc/keystone/default_catalog.templates
+driver=keystone.catalog.backends.sql.Catalog
+template_file=/etc/keystone/default_catalog.templates
[token]
-driver = keystone.token.backends.sql.Token
-
-[policy]
+driver=keystone.token.backends.sql.Token
[ec2]
-driver = keystone.contrib.ec2.backends.sql.Ec2
-
-[ssl]
-
-[signing]
-
-[ldap]
+driver=keystone.contrib.ec2.backends.sql.Ec2
[paste_deploy]
-config_file = /usr/share/keystone/keystone-dist-paste.ini
+config_file=/usr/share/keystone/keystone-dist-paste.ini
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 6e01412..34f4ceb 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,14 +1,14 @@
#
-# This is 2014.1 Icehouse-2 milestone
+# This is 2014.1 Icehouse-3 milestone
#
%global release_name icehouse
-%global milestone 2
+%global milestone 3
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
Version: 2014.1
-Release: 0.3.b%{milestone}%{?dist}
+Release: 0.4.b%{milestone}%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
@@ -22,7 +22,7 @@ Source20: keystone-dist.conf
#
-# patches_base=2014.1.b2
+# patches_base=2014.1.b3
#
Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -36,7 +36,7 @@ BuildRequires: python-pbr
BuildRequires: python-d2to1
Requires: python-keystone = %{version}-%{release}
-Requires: python-keystoneclient >= 1:0.4.1
+Requires: python-keystoneclient >= 1:0.6.0
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -73,6 +73,9 @@ Requires: python-six >= 1.4.1
Requires: python-babel
Requires: python-oauth2
Requires: python-dogpile-cache >= 0.5.0
+Requires: python-jsonschema
+Requires: python-oslo-messaging
+Requires: python-pycadf
%description -n python-keystone
Keystone is a Python implementation of the OpenStack
@@ -120,10 +123,6 @@ cp etc/keystone.conf.sample etc/keystone.conf
# Delete tests
rm -fr %{buildroot}%{python_sitelib}/keystone/tests
-# Delete KDS
-# nothing is using it yet and we need to figure out right (sub)package for it
-rm -f %{buildroot}%{_bindir}/kds-api
-rm -fr %{buildroot}%{python_sitelib}/keystone/contrib/kds
install -d -m 755 %{buildroot}%{_sysconfdir}/keystone
install -p -D -m 640 etc/keystone.conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf
@@ -223,6 +222,9 @@ fi
%endif
%changelog
+* Fri Mar 07 2014 Alan Pevec <apevec at redhat.com> 2014.1-0.4.b3
+- icehouse-3 milestone
+
* Fri Jan 24 2014 Alan Pevec <apevec at redhat.com> 2014.1-0.3.b2
- icehouse-2 milestone
diff --git a/sources b/sources
index 8a3066b..4127f1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-944a15b331407bba185ae78697c77c6b keystone-2014.1.b2.tar.gz
+245b62b8605114aab577a90da0202ea9 keystone-2014.1.b3.tar.gz
More information about the scm-commits
mailing list