openstack/keystone
Code Issues Proposed changes

Merge "Clean up sql connection args"

Browse Source
This commit is contained in:
Jenkins 2012-03-20 17:19:51 +00:00 committed by Gerrit Code Review
commit 9c823977ba
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/configuration.rst
View File

@ -120,9 +120,6 @@ environment::
[sql] [sql]
connection = sqlite:///keystone.db connection = sqlite:///keystone.db
idle_timeout = 200 idle_timeout = 200
min_pool_size = 5
max_pool_size = 10
pool_timeout = 200
.. NOTE:: .. NOTE::

3
etc/keystone.conf
View File

@ -19,9 +19,6 @@ use_syslog = False
[sql] [sql]
connection = sqlite:///keystone.db connection = sqlite:///keystone.db
idle_timeout = 200 idle_timeout = 200
min_pool_size = 5
max_pool_size = 10
pool_timeout = 200
[ldap] [ldap]
#url = ldap://localhost #url = ldap://localhost

5
keystone/config.py
View File

@ -147,10 +147,7 @@ register_str('public_port')
# sql options # sql options
register_str('connection', group='sql') register_str('connection', group='sql')
register_str('idle_timeout', group='sql') register_int('idle_timeout', group='sql')
register_str('min_pool_size', group='sql')
register_str('max_pool_size', group='sql')
register_str('pool_timeout', group='sql')
register_str('driver', group='catalog') register_str('driver', group='catalog')

3
tests/backend_sql.conf
View File

@ -1,9 +1,6 @@
[sql] [sql]
connection = sqlite:///test.db connection = sqlite:///test.db
idle_timeout = 200 idle_timeout = 200
min_pool_size = 5
max_pool_size = 10
pool_timeout = 200
[identity] [identity]
driver = keystone.identity.backends.sql.Identity driver = keystone.identity.backends.sql.Identity