[openstack-keystone] icehouse-2 milestone
Alan Pevec
apevec at fedoraproject.org
Fri Jan 24 20:14:51 UTC 2014
commit 0f8389604973b771718cf4446c5bf4e485148e1a
Author: Alan Pevec <apevec at redhat.com>
Date: Fri Jan 24 20:11:26 2014 +0100
icehouse-2 milestone
.gitignore | 1 +
0001-remove-runtime-dep-on-python-pbr.patch | 38 +++++++++++--------
...-parameter-values-with-keystone-dist.conf.patch | 20 +++++-----
keystone-dist.conf | 2 +-
openstack-keystone.spec | 11 ++++--
sources | 2 +-
6 files changed, 42 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0390676..0b88b81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/keystone-2013.2.tar.gz
/keystone-2014.1.b1.tar.gz
+/keystone-2014.1.b2.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 476a1d4..51e189e 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From ab2d3f4aac3d4342e0218f751dbf7f3796488ed6 Mon Sep 17 00:00:00 2001
+From 53260428c1b1de6d349f094f6fde7352e03b8944 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 | 21 +--------------------
- 3 files changed, 3 insertions(+), 24 deletions(-)
+ requirements.txt | 27 +--------------------------
+ 3 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/bin/keystone-all b/bin/keystone-all
-index 18e2a1c..2adf940 100755
+index 66d1ccc..c1cef5c 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -33,7 +33,6 @@ if os.path.exists(os.path.join(possible_topdir,
@@ -21,17 +21,17 @@ index 18e2a1c..2adf940 100755
from keystone.openstack.common import gettextutils
-@@ -101,7 +100,7 @@ if __name__ == '__main__':
- config_files = [dev_conf]
+@@ -106,7 +105,7 @@ if __name__ == '__main__':
+ sql.initialize()
CONF(project='keystone',
- version=pbr.version.VersionInfo('keystone').version_string(),
+ version='REDHATKEYSTONEVERSION',
default_config_files=config_files)
- config.setup_logging(CONF, product_name='keystone')
+ config.setup_logging()
diff --git a/keystone/cli.py b/keystone/cli.py
-index eaf6e10..e42684e 100644
+index 514e0d7..290ca0a 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -21,7 +21,6 @@ import os
@@ -41,21 +41,21 @@ index eaf6e10..e42684e 100644
-import pbr.version
from keystone.common import openssl
- from keystone.common.sql import migration
-@@ -212,7 +211,7 @@ def main(argv=None, config_files=None):
- CONF.register_cli_opt(command_opt)
+ from keystone.common import sql
+@@ -216,7 +215,7 @@ def main(argv=None, config_files=None):
+
CONF(args=argv[1:],
project='keystone',
- version=pbr.version.VersionInfo('keystone').version_string(),
+ version='REDHATKEYSTONEVERSION',
usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
default_config_files=config_files)
- config.setup_logging(CONF)
+ config.setup_logging()
diff --git a/requirements.txt b/requirements.txt
-index d7cbb73..e975d85 100644
+index 472a949..e975d85 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -1,21 +1,2 @@
+@@ -1,27 +1,2 @@
# keystone dependencies
-pbr>=0.5.21,<1.0
-pam>=0.1.4
@@ -68,13 +68,19 @@ index d7cbb73..e975d85 100644
-Routes>=1.12.3
-six>=1.4.1
-SQLAlchemy>=0.7.8,<=0.7.99
--sqlalchemy-migrate>=0.7.2
+-sqlalchemy-migrate>=0.8.2
-passlib
-lxml>=2.3
-iso8601>=0.1.8
-python-keystoneclient>=0.4.1
-oslo.config>=1.2.0
-Babel>=1.3
--oauth2
+-oauthlib
-dogpile.cache>=0.5.0
+-
+-# KDS exclusive dependencies
+-
+-pecan>=0.2.0
+-pycrypto>=2.6
+-WSME>=0.5b6
+# 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 b3d3c29..f85fdab 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 f7fe6fc486cc04ba6815f17f8a5cefca31748daa Mon Sep 17 00:00:00 2001
+From c00bd925ca2811f6b9c945f29be5cf5265208b72 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
@@ -8,10 +8,10 @@ Subject: [PATCH] sync parameter values with keystone-dist.conf
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index 1910b68..a8b7c2a 100644
+index ce77397..d07eee5 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
-@@ -53,7 +53,7 @@
+@@ -62,7 +62,7 @@
# verbose = False
# Name of log file to output to. If not set, logging will go to stdout.
@@ -20,16 +20,16 @@ index 1910b68..a8b7c2a 100644
# The directory to keep log files in (will be prepended to --logfile)
# log_dir = /var/log/keystone
-@@ -145,7 +145,7 @@
+@@ -163,7 +163,7 @@
- [sql]
+ [database]
# The SQLAlchemy connection string used to connect to the database
-# connection = sqlite:///keystone.db
+# connection = mysql://keystone:keystone@localhost/keystone
- # the timeout before idle sql connections are reaped
- # idle_timeout = 200
-@@ -193,7 +193,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
@@ -38,7 +38,7 @@ index 1910b68..a8b7c2a 100644
[endpoint_filter]
# extension for creating associations between project and endpoints in order to
-@@ -276,7 +276,7 @@
+@@ -322,7 +322,7 @@
# driver = keystone.policy.backends.sql.Policy
[ec2]
@@ -47,7 +47,7 @@ index 1910b68..a8b7c2a 100644
[assignment]
# driver =
-@@ -434,4 +434,4 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
+@@ -488,4 +488,4 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
[paste_deploy]
# Name of the paste configuration file that defines the available pipelines
diff --git a/keystone-dist.conf b/keystone-dist.conf
index f362a9b..c337055 100644
--- a/keystone-dist.conf
+++ b/keystone-dist.conf
@@ -2,7 +2,7 @@
log_file = /var/log/keystone/keystone.log
onready = keystone.common.systemd
-[sql]
+[database]
connection = mysql://keystone:keystone@localhost/keystone
[identity]
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index b3a717f..0c3f3a7 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,14 +1,14 @@
#
-# This is 2014.1 Icehouse-1 milestone
+# This is 2014.1 Icehouse-2 milestone
#
%global release_name icehouse
-%global milestone 1
+%global milestone 2
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
Version: 2014.1
-Release: 0.2.b%{milestone}%{?dist}
+Release: 0.3.b%{milestone}%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
@@ -22,7 +22,7 @@ Source20: keystone-dist.conf
#
-# patches_base=2014.1.b1
+# patches_base=2014.1.b2
#
Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -220,6 +220,9 @@ fi
%endif
%changelog
+* Fri Jan 24 2014 Alan Pevec <apevec at redhat.com> 2014.1-0.3.b2
+- icehouse-2 milestone
+
* Mon Jan 06 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.2.b1
- Set python-six min version to ensure updated
diff --git a/sources b/sources
index 415b466..8a3066b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8dd6dcb9eee52c281b034e7f8e34fea keystone-2014.1.b1.tar.gz
+944a15b331407bba185ae78697c77c6b keystone-2014.1.b2.tar.gz
More information about the scm-commits
mailing list