Merge lp:~gandelman-a/ubuntu/raring/keystone/lp1158563 into lp:~openstack-ubuntu-testing/keystone/grizzly

[Adam Gandelman]

We defaulted to SQL backend for Ec2 and tokens in Essex, Folsom. Continue to do so here, and also default the new trusts manager to use its SQL backend as well.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-02 13:50:52 +0000
+++ debian/changelog	2013-04-04 18:36:21 +0000
@@ -1,3 +1,10 @@
+keystone (1:2013.1~rc3-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/sql_connection.patch: Ensure  SQL by default for all
+    backends. (LP: #1158563)
+
+ -- Adam Gandelman <[e-mail]>  Thu, 04 Apr 2013 11:32:25 -0700
+
 keystone (1:2013.1~rc3-0ubuntu1) raring; urgency=low
 
   * New upstream release. 

=== modified file 'debian/patches/sql_connection.patch'
--- debian/patches/sql_connection.patch	2013-02-19 15:50:46 +0000
+++ debian/patches/sql_connection.patch	2013-04-04 18:36:21 +0000
@@ -1,6 +1,8 @@
---- a/etc/keystone.conf.sample
-+++ b/etc/keystone.conf.sample
-@@ -44,10 +44,10 @@
+Index: keystone/etc/keystone.conf.sample
+===================================================================
+--- keystone.orig/etc/keystone.conf.sample	2013-04-04 11:27:48.093529370 -0700
++++ keystone/etc/keystone.conf.sample	2013-04-04 11:29:52.737535698 -0700
+@@ -43,10 +43,10 @@
  # verbose = False
  
  # Name of log file to output to. If not set, logging will go to stdout.
@@ -13,7 +15,7 @@
  
  # Use syslog for logging.
  # use_syslog = False
-@@ -76,13 +76,13 @@
+@@ -75,13 +75,13 @@
  
  [sql]
  # The SQLAlchemy connection string used to connect to the database
@@ -29,7 +31,15 @@
  
  # 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
-@@ -94,7 +94,7 @@
+@@ -92,14 +92,14 @@
+ # default_domain_id = default
+ 
+ [trust]
+-# driver = keystone.trust.backends.sql.Trust
++driver = keystone.trust.backends.sql.Trust
+ 
+ # delegation and impersonation features can be optionally disabled
+ # enabled = True
  
  [catalog]
  # dynamic, sql-based backend (supports API/CLI-based management commands)
@@ -38,12 +48,12 @@
  
  # static, file-based backend (does *NOT* support any management commands)
  # driver = keystone.catalog.backends.templated.TemplatedCatalog
-@@ -102,16 +102,16 @@
+@@ -107,16 +107,16 @@
  # template_file = default_catalog.templates
  
  [token]
 -# driver = keystone.token.backends.kvs.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
@@ -54,7 +64,7 @@
  
  [ec2]
 -# driver = keystone.contrib.ec2.backends.kvs.Ec2
-+driver = keystone.contrib.ec2.backends.kvs.Ec2
++driver = keystone.contrib.ec2.backends.sql.Ec2
  
  [ssl]
  #enable = True