diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-20 17:19:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-20 17:19:51 +0000 |
| commit | 9c823977baca9944074c62cedf32f5107a95a443 (patch) | |
| tree | 9349ae28f72329e684b5b828aba2e4aa92121f18 | |
| parent | 3263f45926f054c759caa10e391777e7372e73a1 (diff) | |
| parent | 6f8752bf6ea74fb8841dac1a1d6b62af019b48e5 (diff) | |
| download | keystone-9c823977baca9944074c62cedf32f5107a95a443.tar.gz keystone-9c823977baca9944074c62cedf32f5107a95a443.tar.xz keystone-9c823977baca9944074c62cedf32f5107a95a443.zip | |
Merge "Clean up sql connection args"
| -rw-r--r-- | doc/source/configuration.rst | 3 | ||||
| -rw-r--r-- | etc/keystone.conf | 3 | ||||
| -rw-r--r-- | keystone/config.py | 5 | ||||
| -rw-r--r-- | tests/backend_sql.conf | 3 |
4 files changed, 1 insertions, 13 deletions
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index ad47d424..0276f955 100644 --- 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 index bcb6a6ae..56309c31 100644 --- 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 index ba4f7b25..41f2743f 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -147,10 +147,7 @@ register_str('public_port') # 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 index a9ca1239..b0b65b6d 100644 --- 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 |