[openstack-keystone/juno-master] juno-1 milestone
Alan Pevec
apevec at fedoraproject.org
Thu Jun 12 23:33:46 UTC 2014
commit 91f87336fef24eb0813798ab84a3a789122731e9
Author: Alan Pevec <alan.pevec at redhat.com>
Date: Fri Jun 13 01:21:36 2014 +0200
juno-1 milestone
.gitignore | 1 +
0001-remove-runtime-dep-on-python-pbr.patch | 27 +-
...-parameter-values-with-keystone-dist.conf.patch | 20 +-
0003-Refactor-service-readiness-notification.patch | 265 --------------------
openstack-keystone.spec | 28 ++-
sources | 2 +-
6 files changed, 43 insertions(+), 300 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69f1027..3efb196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/keystone-2014.1.tar.gz
/keystone-2014.1.1.tar.gz
+/keystone-2014.2.b1.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 758ba73..c7c60c8 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From ac4d68e2aa6612cf9904baba7f2505ebddf6e82c Mon Sep 17 00:00:00 2001
+From 47ef4045c06e1aaa1cacbd9b1f193705187e5fc1 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,11 +6,11 @@ Subject: [PATCH] remove runtime dep on python-pbr
---
bin/keystone-all | 3 +--
keystone/cli.py | 3 +--
- requirements.txt | 23 +----------------------
- 3 files changed, 3 insertions(+), 26 deletions(-)
+ requirements.txt | 24 +-----------------------
+ 3 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/bin/keystone-all b/bin/keystone-all
-index 8d7c4b3..315f3c1 100755
+index 3214d13..2e468be 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir,
@@ -21,7 +21,7 @@ index 8d7c4b3..315f3c1 100755
from keystone.openstack.common import gettextutils
# NOTE(dstanek): gettextutils.enable_lazy() must be called before
-@@ -110,7 +109,7 @@ if __name__ == '__main__':
+@@ -102,7 +101,7 @@ if __name__ == '__main__':
config.set_default_for_default_log_levels()
CONF(project='keystone',
@@ -52,12 +52,12 @@ index a9decbd..9411219 100644
default_config_files=config_files)
config.setup_logging()
diff --git a/requirements.txt b/requirements.txt
-index 4b76b1b..e975d85 100644
+index 31b98ea..e975d85 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -1,23 +1,2 @@
+@@ -1,24 +1,2 @@
# keystone dependencies
--pbr>=0.6,<1.0
+-pbr>=0.6,!=0.7,<1.0
-WebOb>=1.2.3
-eventlet>=0.13.0
-greenlet>=0.3.2
@@ -67,16 +67,17 @@ index 4b76b1b..e975d85 100644
-Routes>=1.12.3
-six>=1.6.0
-SQLAlchemy>=0.7.8,<=0.9.99
--sqlalchemy-migrate>=0.8.2,!=0.8.4
+-sqlalchemy-migrate>=0.9.1
-passlib
-lxml>=2.3
-iso8601>=0.1.9
--python-keystoneclient>=0.7.0
+-python-keystoneclient>=0.9.0
-oslo.config>=1.2.0
--oslo.messaging>=1.3.0a9
+-oslo.messaging>=1.3.0
-Babel>=1.3
-oauthlib>=0.6
--dogpile.cache>=0.5.0
+-dogpile.cache>=0.5.3
-jsonschema>=2.0.0,<3.0.0
--pycadf>=0.4.1
+-pycadf>=0.5.1
+-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 b64388d..5118032 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 dc539d8b2dd41d8742eae7ff47e6ecec6d6256c6 Mon Sep 17 00:00:00 2001
+From 09b04beb1c52077b68cd25a354d11e706350c96f 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 c5f57bf..3aa1314 100644
+index b20139d..b8d39d5 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
-@@ -385,7 +385,7 @@
+@@ -361,7 +361,7 @@
#verbose=false
# Log output to standard error (boolean value)
@@ -23,7 +23,7 @@ index c5f57bf..3aa1314 100644
# Format string to use for log messages with context (string
# value)
-@@ -439,10 +439,11 @@
+@@ -415,10 +415,11 @@
# %(default)s (string value)
#log_date_format=%Y-%m-%d %H:%M:%S
@@ -38,16 +38,16 @@ index c5f57bf..3aa1314 100644
# (Optional) The base directory used for relative --log-file
# paths (string value)
-@@ -581,7 +582,7 @@
+@@ -555,7 +556,7 @@
# 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)
+ # Catalog backend driver. (string value)
#driver=keystone.catalog.backends.sql.Catalog
-@@ -622,7 +623,7 @@
+@@ -596,7 +597,7 @@
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
@@ -56,16 +56,16 @@ index c5f57bf..3aa1314 100644
# The SQL mode to be used for MySQL sessions. This option,
# including the default, overrides any server-set SQL mode. To
-@@ -710,7 +711,7 @@
+@@ -684,7 +685,7 @@
#
- # Keystone EC2Credential backend driver. (string value)
+ # EC2Credential backend driver. (string value)
-#driver=keystone.contrib.ec2.backends.kvs.Ec2
+#driver=keystone.contrib.ec2.backends.sql.Ec2
[endpoint_filter]
-@@ -1147,7 +1148,7 @@
+@@ -1129,7 +1130,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 6779297..821ba5b 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,18 +1,20 @@
#
-# This is 2014.1.1 Icehouse stable release
+# This is 2014.2 Juno-1 milestone
#
-%global release_name icehouse
+%global release_name juno
+%global milestone 1
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
-Version: 2014.1.1
-Release: 1%{?dist}
+Version: 2014.2
+Release: 0.1.b%{milestone}%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
URL: http://keystone.openstack.org/
-Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
+#Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
+Source0: http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.b%{milestone}.tar.gz
Source1: openstack-keystone.logrotate
Source2: openstack-keystone.service
Source5: openstack-keystone-sample-data
@@ -20,11 +22,10 @@ Source20: keystone-dist.conf
#
-# patches_base=2014.1.1
+# patches_base=2014.2.b1
#
Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
-Patch0003: 0003-Refactor-service-readiness-notification.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -35,7 +36,7 @@ BuildRequires: python-pbr
BuildRequires: python-d2to1
Requires: python-keystone = %{version}-%{release}
-Requires: python-keystoneclient >= 1:0.6.0
+Requires: python-keystoneclient >= 1:0.9.0
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -71,10 +72,11 @@ Requires: python-netaddr
Requires: python-six >= 1.4.1
Requires: python-babel
Requires: python-oauthlib
-Requires: python-dogpile-cache >= 0.5.0
+Requires: python-dogpile-cache >= 0.5.3
Requires: python-jsonschema
Requires: python-oslo-messaging
Requires: python-pycadf
+Requires: python-posix_ipc
%description -n python-keystone
Keystone is a Python implementation of the OpenStack
@@ -95,11 +97,10 @@ This package contains documentation for Keystone.
%endif
%prep
-%setup -q -n keystone-%{version}
+%setup -q -n keystone-%{version}.b%{milestone}
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -109,6 +110,8 @@ rm -rf keystone.egg-info
# Remove dependency on pbr and set version as per rpm
sed -i s/REDHATKEYSTONEVERSION/%{version}/ bin/keystone-all keystone/cli.py
+sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
+
# make doc build compatible with python-oslo-sphinx RPM
sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
@@ -222,6 +225,9 @@ fi
%endif
%changelog
+* Fri Jun 13 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.1.b1
+- juno-1 milestone
+
* Fri Jun 06 2014 Alan Pevec <apevec at redhat.com> 2014.1.1-1
- updated to stable icehouse 2014.1.1 release
- Keystone user and group id mismatch CVE-2014-0204
diff --git a/sources b/sources
index d3f2d7a..eb6441a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e99ecd6e0e24fedb69c42108960b3ea4 keystone-2014.1.1.tar.gz
+b7bc2438a5f5ac9e2ae61937ac465791 keystone-2014.2.b1.tar.gz
More information about the scm-commits
mailing list