summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bechtold <tbechtold@suse.com>2019-01-03 15:55:29 +0100
committerThomas Bechtold <tbechtold@suse.com>2019-01-03 15:55:29 +0100
commit941354d6cf44911038448953e195a32a55a42762 (patch)
treec620e5009b8977b52b21cce389122bbede066d74
parent2a27a433d3f579c731c13ef05b89ba4943e204d5 (diff)
Move/Drop useless SQL related config options
The following config option was moved to another place: - [Default]sqlite_db : Only used for testing so move it to the test config options. That way, it is not visible in the manila.conf.sample file The following config options were removed and are now handled via oslo.db: - [Default]sqlite_synchronous : already handled by oslo.db . The new place is "[database]sqlite_synchronous" but the deprecated section/names are handled - [Default]sql_idle_timeout : already handled by oslo.db . The new place is "[database]connection_recycle_time" but the deprecated section/names are handled - [Default]sql_max_retries : already handled by oslo.db . The new place is "[database]max_retries" but the deprecated section/names are handled - [Default]sql_retry_interval : already handled by oslo.db . The new place is "[database]retry_interval" but the deprecated section/names are handled Change-Id: I17e9b69d4ce4b8e624313d05f72d25b3fc2b458c
Notes
Notes (review): Code-Review+2: Tom Barron <tpb@dyncloud.net> Code-Review+2: Goutham Pacha Ravi <gouthampravi@gmail.com> Workflow+1: Goutham Pacha Ravi <gouthampravi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 04 Jan 2019 21:06:56 +0000 Reviewed-on: https://review.openstack.org/628198 Project: openstack/manila Branch: refs/heads/master
-rw-r--r--manila/common/config.py16
-rw-r--r--manila/test.py3
2 files changed, 3 insertions, 16 deletions
diff --git a/manila/common/config.py b/manila/common/config.py
index 30825b4..81bdae7 100644
--- a/manila/common/config.py
+++ b/manila/common/config.py
@@ -77,22 +77,6 @@ global_opts = [
77 cfg.ListOpt('osapi_share_extension', 77 cfg.ListOpt('osapi_share_extension',
78 default=['manila.api.contrib.standard_extensions'], 78 default=['manila.api.contrib.standard_extensions'],
79 help='The osapi share extensions to load.'), 79 help='The osapi share extensions to load.'),
80 cfg.StrOpt('sqlite_db',
81 default='manila.sqlite',
82 help='The filename to use with sqlite.'),
83 cfg.BoolOpt('sqlite_synchronous',
84 default=True,
85 help='If passed, use synchronous mode for sqlite.'),
86 cfg.IntOpt('sql_idle_timeout',
87 default=3600,
88 help='Timeout before idle SQL connections are reaped.'),
89 cfg.IntOpt('sql_max_retries',
90 default=10,
91 help='Maximum database connection retries during startup. '
92 '(setting -1 implies an infinite retry count).'),
93 cfg.IntOpt('sql_retry_interval',
94 default=10,
95 help='Interval between retries of opening a SQL connection.'),
96 cfg.StrOpt('scheduler_manager', 80 cfg.StrOpt('scheduler_manager',
97 default='manila.scheduler.manager.SchedulerManager', 81 default='manila.scheduler.manager.SchedulerManager',
98 help='Full class name for the scheduler manager.'), 82 help='Full class name for the scheduler manager.'),
diff --git a/manila/test.py b/manila/test.py
index ab2273a..d488c45 100644
--- a/manila/test.py
+++ b/manila/test.py
@@ -48,6 +48,9 @@ test_opts = [
48 cfg.StrOpt('sqlite_clean_db', 48 cfg.StrOpt('sqlite_clean_db',
49 default='clean.sqlite', 49 default='clean.sqlite',
50 help='File name of clean sqlite database.'), 50 help='File name of clean sqlite database.'),
51 cfg.StrOpt('sqlite_db',
52 default='manila.sqlite',
53 help='The filename to use with sqlite.'),
51] 54]
52 55
53CONF = cfg.CONF 56CONF = cfg.CONF