← Back to branch summary

~cisco-openstack/keystone/icehouse

« back to all changes in this revision

Viewing changes to debian/patches/sql_connection.patch

  • Committer: Chris Ricker
  • Date: 2013-10-02 13:23:12 UTC
  • Revision ID: chris.ricker@gmail.com-20131002132312-tvpr2av52uycmj0w
Rebase patches for new upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sql_connection.patch
1
 
Index: keystone/etc/keystone.conf.sample
2
 
===================================================================
3
 
--- keystone.orig/etc/keystone.conf.sample      2013-09-06 16:16:47.387560268 -0700
4
 
+++ keystone/etc/keystone.conf.sample   2013-09-06 16:16:47.383560268 -0700
 
1
diff -Naur keystone-2013.2.rc1.orig/etc/keystone.conf.sample keystone-2013.2.rc1/etc/keystone.conf.sample
 
2
--- keystone-2013.2.rc1.orig/etc/keystone.conf.sample   2013-10-02 05:56:04.000000000 -0700
 
3
+++ keystone-2013.2.rc1/etc/keystone.conf.sample        2013-10-02 06:21:19.891091167 -0700
5
4
@@ -52,10 +52,10 @@
6
5
 # verbose = False
7
6
 
15
14
 
16
15
 # Use syslog for logging.
17
16
 # use_syslog = False
18
 
@@ -84,13 +84,13 @@
 
17
@@ -140,13 +140,13 @@
19
18
 
20
19
 [sql]
21
20
 # The SQLAlchemy connection string used to connect to the database
31
30
 
32
31
 # This references the domain to use for all Identity API v2 requests (which are
33
32
 # not aware of domains). A domain with this ID will be created for you by
34
 
@@ -112,10 +112,10 @@
 
33
@@ -168,10 +168,10 @@
35
34
 # max_password_length = 4096
36
35
 
37
36
 [credential]
44
43
 
45
44
 # delegation and impersonation features can be optionally disabled
46
45
 # enabled = True
47
 
@@ -127,7 +127,7 @@
 
46
@@ -183,7 +183,7 @@
48
47
 
49
48
 [catalog]
50
49
 # dynamic, sql-based backend (supports API/CLI-based management commands)
53
52
 
54
53
 # static, file-based backend (does *NOT* support any management commands)
55
54
 # driver = keystone.catalog.backends.templated.TemplatedCatalog
56
 
@@ -142,7 +142,7 @@
 
55
@@ -198,7 +198,7 @@
57
56
 
58
57
 [token]
59
58
 # Provides token persistence.
62
61
 
63
62
 # Controls the token construction, validation, and revocation operations.
64
63
 # Core providers are keystone.token.providers.[pki|uuid].Provider
65
 
@@ -212,10 +212,10 @@
 
64
@@ -268,10 +268,10 @@
66
65
 # debug_cache_backend = False
67
66
 
68
67
 [policy]