[openstack-keystone/el6-grizzly: 4/4] Merge branch 'f19' into el6-grizzly

[Alan Pevec]

commit 68d2d667809da780871eb62924291dcc4742ac0f
Merge: 5c46c9e f137ec5
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Mar 21 13:08:05 2014 +0100

    Merge branch 'f19' into el6-grizzly
    
    Conflicts:
    	openstack-keystone.spec
    	0001-change-default-configuration.patch

 .gitignore                                         |    1 +
 ...role-assignment-adds-role-using-LDAP-assi.patch |   74 --------------------
 0001-change-default-configuration.patch            |   71 +++++++++++++++++++
 openstack-keystone.spec                            |   24 +++----
 sources                                            |    2 +-
 5 files changed, 83 insertions(+), 89 deletions(-)
---
diff --cc 0001-change-default-configuration.patch
index 0000000,b436033..cc1e88a
mode 000000,100644..100644
--- a/0001-change-default-configuration.patch
+++ b/0001-change-default-configuration.patch
@@@ -1,0 -1,71 +1,71 @@@
+ From f61d5894a370a6bff83f9a47eefcd5e8af4274de Mon Sep 17 00:00:00 2001
+ From: Alan Pevec <apevec at redhat.com>
+ Date: Fri, 21 Mar 2014 00:19:58 +0100
+ Subject: [PATCH] change default configuration
+ 
+ instead of using openstack-config in spec,
+ change defaults in a patch to avoid crudini issue
+ 
+ Resolves: rhbz#1057621
+ ---
+  etc/keystone.conf.sample | 8 ++++++++
+  1 file changed, 8 insertions(+)
+ 
+ diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
+ index 9e66eb6..ae486fd 100644
+ --- a/etc/keystone.conf.sample
+ +++ b/etc/keystone.conf.sample
+ @@ -44,6 +44,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 directory to keep log files in (will be prepended to --logfile)
+  # log_dir = /var/log/keystone
+ @@ -72,16 +73,19 @@
+  # onready = systemd-notify --ready
+  # or a module with notify() method:
+  # onready = keystone.common.systemd
 -+onready = keystone.common.systemd
+++#onready = keystone.common.systemd
+  
+  [sql]
+  # 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
+  
+  [identity]
+  # driver = keystone.identity.backends.sql.Identity
+ +driver = keystone.identity.backends.sql.Identity
+  
+  # This references the domain to use for all Identity API v2 requests (which are
+  # not aware of domains). A domain with this ID will be created for you by
+ @@ -100,14 +104,17 @@
+  [catalog]
+  # dynamic, sql-based backend (supports API/CLI-based management commands)
+  # driver = keystone.catalog.backends.sql.Catalog
+ +driver = keystone.catalog.backends.sql.Catalog
+  
+  # static, file-based backend (does *NOT* support any management commands)
+  # driver = keystone.catalog.backends.templated.TemplatedCatalog
+  
+  # template_file = default_catalog.templates
+ +template_file = /etc/keystone/default_catalog.templates
+  
+  [token]
+  # driver = keystone.token.backends.kvs.Token
+ +driver = keystone.token.backends.sql.Token
+  
+  # Amount of time a token should remain valid (in seconds)
+  # expiration = 86400
+ @@ -117,6 +124,7 @@
+  
+  [ec2]
+  # driver = keystone.contrib.ec2.backends.kvs.Ec2
+ +driver = keystone.contrib.ec2.backends.sql.Ec2
+  
+  [ssl]
+  #enable = True
diff --cc openstack-keystone.spec
index 5520416,e5be92e..4b33794
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -14,28 -14,20 +14,28 @@@ License:        ASL 2.
  URL:            http://keystone.openstack.org/
  Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
 +Source3:        openstack-keystone.upstart
  Source5:        openstack-keystone-sample-data
  
 +Patch0:       openstack-keystone-newdeps.patch
  
  #
- # patches_base=2013.1.4
+ # patches_base=2013.1.5
  #
- Patch0001: 0001-Fix-remove-role-assignment-adds-role-using-LDAP-assi.patch
+ Patch0001: 0001-change-default-configuration.patch
  
  BuildArch:      noarch
 +
  BuildRequires:  python2-devel
 -BuildRequires:  python-sphinx >= 1.0
 +BuildRequires:  python-sphinx10
  BuildRequires:  openstack-utils
 -BuildRequires:  systemd-units
 +BuildRequires:  python-iniparse
 +# These are required to build due to the requirements check added
 +BuildRequires:  python-sqlalchemy0.7
 +BuildRequires:  python-webob1.0
 +BuildRequires:  python-paste-deploy1.5
 +BuildRequires:  python-routes1.12
  
  Requires:       python-keystone = %{version}-%{release}
  Requires:       python-keystoneclient >= 1:0.2.0