[openstack-keystone] juno-3 milestone
Alan Pevec
apevec at fedoraproject.org
Fri Sep 5 23:51:09 UTC 2014
commit 774724d33694d8840cfbd1013a98bdfd2f0839f0
Author: Alan Pevec <alan.pevec at redhat.com>
Date: Fri Sep 5 19:05:46 2014 +0200
juno-3 milestone
.gitignore | 1 +
0001-remove-runtime-dep-on-python-pbr.patch | 18 +++++++++---------
...-parameter-values-with-keystone-dist.conf.patch | 16 ++++++++--------
openstack-keystone.spec | 16 +++++++++-------
sources | 2 +-
5 files changed, 28 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21e8c9c..8bbf415 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/keystone-2014.1.1.tar.gz
/keystone-2014.2.b1.tar.gz
/keystone-2014.2.b2.tar.gz
+/keystone-2014.2.b3.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index e7fb0b9..c96d6e5 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From dd952ff6d0802f4f5ee1a39c4c9000d5c24913aa Mon Sep 17 00:00:00 2001
+From 16959aa5e419fa0de0e8e0f170dd051808d89fb1 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
@@ -31,7 +31,7 @@ index 732ee8e..e548763 100755
config.setup_logging()
diff --git a/keystone/cli.py b/keystone/cli.py
-index 8a22d5f..641d49a 100644
+index e8c84af..140832d 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -17,7 +17,6 @@ from __future__ import absolute_import
@@ -52,7 +52,7 @@ index 8a22d5f..641d49a 100644
default_config_files=config_files)
config.setup_logging()
diff --git a/requirements.txt b/requirements.txt
-index 1e033bd..e975d85 100644
+index 4d3ea05..e975d85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,27 +1,2 @@
@@ -66,21 +66,21 @@ index 1e033bd..e975d85 100644
-Paste
-Routes>=1.12.3,!=2.0
-six>=1.7.0
--SQLAlchemy>=0.8.4,!=0.9.5,<=0.9.99
+-SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
-sqlalchemy-migrate>=0.9.1
-passlib
--lxml>=2.3
-iso8601>=0.1.9
-python-keystoneclient>=0.9.0
--keystonemiddleware
--oslo.config>=1.2.1
--oslo.messaging>=1.3.0
+-keystonemiddleware>=1.0.0
+-oslo.config>=1.4.0.0a3
+-oslo.messaging>=1.4.0.0a3
-oslo.db>=0.2.0 # Apache-2.0
-oslo.i18n>=0.1.0 # Apache-2.0
+-oslo.utils>=0.1.1
-Babel>=1.3
-oauthlib>=0.6
-dogpile.cache>=0.5.3
-jsonschema>=2.0.0,<3.0.0
--pycadf>=0.5.1
+-pycadf>=0.6.0
-posix_ipc
+# 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 3037ae1..c6392fa 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From 65b81531dd4a3b386a07bc3e0d5972e9cf831a2c Mon Sep 17 00:00:00 2001
+From 21a7072cd41ce9f209a41d2b4e5786b8667ae293 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
@@ -11,10 +11,10 @@ Change-Id: If36c384f86843a6506a494d79beca65639fb3480
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index bddcc24..52a9179 100644
+index 9f6051b..f7f6a0e 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
-@@ -395,7 +395,7 @@
+@@ -347,7 +347,7 @@
#verbose=false
# Log output to standard error. (boolean value)
@@ -23,7 +23,7 @@ index bddcc24..52a9179 100644
# Format string to use for log messages with context. (string
# value)
-@@ -450,10 +450,11 @@
+@@ -402,10 +402,11 @@
# %(default)s . (string value)
#log_date_format=%Y-%m-%d %H:%M:%S
@@ -38,7 +38,7 @@ index bddcc24..52a9179 100644
# (Optional) The base directory used for relative --log-file
# paths. (string value)
-@@ -585,7 +586,7 @@
+@@ -537,7 +538,7 @@
# Catalog template file name for use with the template catalog
# backend. (string value)
@@ -47,7 +47,7 @@ index bddcc24..52a9179 100644
# Catalog backend driver. (string value)
#driver=keystone.catalog.backends.sql.Catalog
-@@ -626,7 +627,7 @@
+@@ -587,7 +588,7 @@
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
@@ -56,7 +56,7 @@ index bddcc24..52a9179 100644
# The SQLAlchemy connection string to use to connect to the
# slave database. (string value)
-@@ -719,7 +720,7 @@
+@@ -680,7 +681,7 @@
#
# EC2Credential backend driver. (string value)
@@ -65,7 +65,7 @@ index bddcc24..52a9179 100644
[endpoint_filter]
-@@ -1213,7 +1214,7 @@
+@@ -1241,7 +1242,7 @@
# Name of the paste configuration file that defines the
# available pipelines. (string value)
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 8732132..cb18dd3 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,14 +1,14 @@
#
-# This is 2014.2 Juno-2 milestone
+# This is 2014.2 Juno-3 milestone
#
%global release_name juno
-%global milestone 2
+%global milestone 3
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
Version: 2014.2
-Release: 0.2.b%{milestone}%{?dist}
+Release: 0.3.b%{milestone}%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
@@ -26,7 +26,7 @@ Source23: openstack-keystone.upstart
#
-# patches_base=2014.2.b2
+# patches_base=2014.2.b3
#
Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -69,12 +69,11 @@ Group: Applications/System
Requires: python-eventlet
Requires: python-ldap
-Requires: python-lxml
Requires: python-memcached
Requires: python-migrate
Requires: python-paste-deploy >= 1.5.0
Requires: python-routes >= 1.12
-Requires: python-sqlalchemy >= 0.7.8
+Requires: python-sqlalchemy >= 0.8.4
Requires: python-webob >= 1.2.3
Requires: python-passlib
Requires: MySQL-python
@@ -89,7 +88,7 @@ Requires: python-oauthlib
Requires: python-dogpile-cache >= 0.5.3
Requires: python-jsonschema
Requires: python-oslo-messaging
-Requires: python-pycadf
+Requires: python-pycadf >= 0.6.0
Requires: python-posix_ipc
Requires: python-keystonemiddleware
Requires: python-oslo-db
@@ -271,6 +270,9 @@ fi
%endif
%changelog
+* Fri Sep 05 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.3.b3
+- juno-3 milestone
+
* Fri Jul 25 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.2.b2
- juno-2 milestone
diff --git a/sources b/sources
index 3658a28..6556ffb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfbf8c210ad9e4eae356523469e67bdb keystone-2014.2.b2.tar.gz
+bca54f5c7638ac4c1e31f0df704d6e1c keystone-2014.2.b3.tar.gz
More information about the scm-commits
mailing list