summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlilintan <lintan.li@easystack.cn>2016-08-16 13:51:44 +0800
committerAman Kumar <aman.kumar3@hpe.com>2017-04-03 10:37:43 +0000
commit4b4b9cb8f123c8bce0ef243171b19b54eb6270b3 (patch)
treef6c4c32aeaaa278a46030c70cc87653d5273776c
parentbd7c3a7708de2aaeaa374a9ee563da1e1a0955c8 (diff)
downloadneutron-4b4b9cb8f123c8bce0ef243171b19b54eb6270b3.tar.gz
Don't pass argument sqlite_db in method set_defaults
Config option sqlite_db is deprecated for removal[1], so don't need set its default value. [1]https://github.com/openstack/oslo.db/blob/\ 0a1bae9859079fb21a03716be947c5f1da6db0a2/oslo_db/options.py#L17 Change-Id: Ie1e94e03013e8f1e47bbc1cd12f8d1b81a4cb24e (cherry picked from commit f03a6f944a141a03616de71bb36c4b2d2802feb3)
-rw-r--r--neutron/common/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/neutron/common/config.py b/neutron/common/config.py
index b14b8ff4ce..41b97cfc4b 100644
--- a/neutron/common/config.py
+++ b/neutron/common/config.py
@@ -214,7 +214,7 @@ def set_db_defaults():
db_options.set_defaults(
cfg.CONF,
connection='sqlite://',
- sqlite_db='', max_pool_size=10,
+ max_pool_size=10,
max_overflow=20, pool_timeout=10)
set_db_defaults()