Clean up sql connection args

* Convert idle_timeout (pool_recycle) to integer * Drop min_pool_size, max_pool_size, pool_timeout * Fixes bug 959916 Change-Id: Ie124b3abdf00358d6b722e1c2e2a2fb22967ca5a
openstack · Mar 20, 2012 · 6f8752b · 6f8752b
1 parent 36b2b22
commit 6f8752b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
@@ -120,9 +120,6 @@ environment::
     [sql]
     connection = sqlite:///keystone.db
     idle_timeout = 200
-    min_pool_size = 5
-    max_pool_size = 10
-    pool_timeout = 200
 
 .. NOTE::
 

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

diff --git a/keystone/config.py b/keystone/config.py
@@ -147,10 +147,7 @@ def _ensure_group(kw, conf):
 
 # sql options
 register_str('connection', group='sql')
-register_str('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_int('idle_timeout', group='sql')
 
 
 register_str('driver', group='catalog')

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