From e810b86020a03db182d397a52472d82cbfef02a4 Mon Sep 17 00:00:00 2001 From: Rikimaru Honjo Date: Wed, 29 Mar 2017 13:57:43 +0900 Subject: [PATCH] Don't pass argument sqlite_db in set_defaults() Config option sqlite_db was removed from oslo.db[1]. And that isn't used in Masakari. So we shouldn't set its default value. Remarks: Unit tests will be failed if this argument is passed in the latest oslo.db. [1]https://github.com/openstack/oslo.db/commit/cc64f7010522e812a696159009a72e59e2b017a8 Change-Id: I9ae18b905eddb5441b96e0209efc35a98cfbaa4c Closes-Bug: #1677138 --- masakari/conf/database.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/masakari/conf/database.py b/masakari/conf/database.py index a9339f9d..d80086ca 100644 --- a/masakari/conf/database.py +++ b/masakari/conf/database.py @@ -22,8 +22,7 @@ _DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def( def register_opts(conf): - oslo_db_options.set_defaults(conf, connection=_DEFAULT_SQL_CONNECTION, - sqlite_db='masakari.sqlite') + oslo_db_options.set_defaults(conf, connection=_DEFAULT_SQL_CONNECTION) def list_opts():