[openstack-keystone] Update to upstream 2014.2.rc1
Alan Pevec
apevec at fedoraproject.org
Tue Sep 30 23:39:57 UTC 2014
commit 46f397d8ce145d339ca7f241dd1b40ce68d92f6d
Author: Alan Pevec <alan.pevec at redhat.com>
Date: Wed Oct 1 01:04:01 2014 +0200
Update to upstream 2014.2.rc1
.gitignore | 1 +
0001-remove-runtime-dep-on-python-pbr.patch | 14 +++++-----
...-parameter-values-with-keystone-dist.conf.patch | 16 +++++-----
openstack-keystone.spec | 29 +++++++++++--------
sources | 2 +-
5 files changed, 34 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8bbf415..4a24c70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/keystone-2014.2.b1.tar.gz
/keystone-2014.2.b2.tar.gz
/keystone-2014.2.b3.tar.gz
+/keystone-2014.2.rc1.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index f2f8609..eeefe4d 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 3837f8ccf791cae1f6abc10d20e0aa4ce99038f0 Mon Sep 17 00:00:00 2001
+From 255547c739d270857c075c5050683d0dab82c511 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
@@ -9,18 +9,18 @@ Subject: [PATCH] remove runtime dep on python-pbr
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/bin/keystone-all b/bin/keystone-all
-index 732ee8e..e548763 100755
+index 89e5128..90f6f8e 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
-@@ -21,7 +21,6 @@ import sys
+@@ -20,7 +20,6 @@ import socket
+ import sys
from oslo import i18n
- from paste import deploy
-import pbr.version
# If ../keystone/__init__.py exists, add ../ to Python search path, so that
-@@ -117,7 +116,7 @@ if __name__ == '__main__':
+@@ -127,7 +126,7 @@ if __name__ == '__main__':
config.set_default_for_default_log_levels()
CONF(project='keystone',
@@ -30,7 +30,7 @@ index 732ee8e..e548763 100755
config.setup_logging()
diff --git a/keystone/cli.py b/keystone/cli.py
-index e8c84af..140832d 100644
+index 4cc20eb..50d7880 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -17,7 +17,6 @@ from __future__ import absolute_import
@@ -41,7 +41,7 @@ index e8c84af..140832d 100644
from keystone import assignment
from keystone.common import openssl
-@@ -285,7 +284,7 @@ def main(argv=None, config_files=None):
+@@ -300,7 +299,7 @@ def main(argv=None, config_files=None):
CONF(args=argv[1:],
project='keystone',
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index c6392fa..629d699 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 21a7072cd41ce9f209a41d2b4e5786b8667ae293 Mon Sep 17 00:00:00 2001
+From 30caade704deb230ba52b4f036982168b4fbba3f 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 9f6051b..f7f6a0e 100644
+index c058a03..6ef183e 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
-@@ -347,7 +347,7 @@
+@@ -353,7 +353,7 @@
#verbose=false
# Log output to standard error. (boolean value)
@@ -23,7 +23,7 @@ index 9f6051b..f7f6a0e 100644
# Format string to use for log messages with context. (string
# value)
-@@ -402,10 +402,11 @@
+@@ -408,10 +408,11 @@
# %(default)s . (string value)
#log_date_format=%Y-%m-%d %H:%M:%S
@@ -38,7 +38,7 @@ index 9f6051b..f7f6a0e 100644
# (Optional) The base directory used for relative --log-file
# paths. (string value)
-@@ -537,7 +538,7 @@
+@@ -572,7 +573,7 @@
# Catalog template file name for use with the template catalog
# backend. (string value)
@@ -47,7 +47,7 @@ index 9f6051b..f7f6a0e 100644
# Catalog backend driver. (string value)
#driver=keystone.catalog.backends.sql.Catalog
-@@ -587,7 +588,7 @@
+@@ -629,7 +630,7 @@
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
@@ -56,7 +56,7 @@ index 9f6051b..f7f6a0e 100644
# The SQLAlchemy connection string to use to connect to the
# slave database. (string value)
-@@ -680,7 +681,7 @@
+@@ -722,7 +723,7 @@
#
# EC2Credential backend driver. (string value)
@@ -65,7 +65,7 @@ index 9f6051b..f7f6a0e 100644
[endpoint_filter]
-@@ -1241,7 +1242,7 @@
+@@ -1307,7 +1308,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 8ba5a13..9df6661 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,20 +1,17 @@
-#
-# This is 2014.2 Juno-3 milestone
-#
%global release_name juno
-%global milestone 3
+%global milestone rc1
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
Version: 2014.2
-Release: 0.4.b%{milestone}%{?dist}
+Release: 0.5.%{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}/%{release_name}-%{milestone}/+download/keystone-%{version}.b%{milestone}.tar.gz
+Source0: http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.%{milestone}.tar.gz
Source1: openstack-keystone.logrotate
Source2: openstack-keystone.service
Source3: openstack-keystone.sysctl
@@ -26,20 +23,18 @@ Source23: openstack-keystone.upstart
#
-# patches_base=2014.2.b3
+# patches_base=2014.2.rc1
#
Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
BuildArch: noarch
BuildRequires: python2-devel
-BuildRequires: python-sphinx >= 1.1.2
-BuildRequires: python-oslo-sphinx
BuildRequires: python-pbr
BuildRequires: python-d2to1
Requires: python-keystone = %{version}-%{release}
-Requires: python-keystoneclient >= 1:0.9.0
+Requires: python-keystoneclient >= 1:0.10.0
%if 0%{?rhel} == 6
Requires(post): chkconfig
@@ -107,6 +102,13 @@ This package contains the Keystone Python library.
Summary: Documentation for OpenStack Identity Service
Group: Documentation
+BuildRequires: python-sphinx >= 1.1.2
+BuildRequires: python-oslo-sphinx
+# for API autodoc
+BuildRequires: python-keystonemiddleware
+BuildRequires: python-ldappool
+
+
%description doc
Keystone is a Python implementation of the OpenStack
(http://www.openstack.org) identity service API.
@@ -115,7 +117,7 @@ This package contains documentation for Keystone.
%endif
%prep
-%setup -q -n keystone-%{version}.b%{milestone}
+%setup -q -n keystone-%{version}.%{milestone}
%patch0001 -p1
%patch0002 -p1
@@ -129,7 +131,7 @@ rm -f test-requirements.txt requirements.txt
# 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
+sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
# make doc build compatible with python-oslo-sphinx RPM
sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
@@ -273,6 +275,9 @@ fi
%endif
%changelog
+* Wed Oct 01 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-0.5.rc1
+- Update to upstream 2014.2.rc1
+
* Thu Sep 11 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.4.b3
- update dependencies
diff --git a/sources b/sources
index 6556ffb..3ea7e9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bca54f5c7638ac4c1e31f0df704d6e1c keystone-2014.2.b3.tar.gz
+facdb53a629ded3146856d11d048ebfe keystone-2014.2.rc1.tar.gz
More information about the scm-commits
mailing list