summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-04 21:06:56 +0000
committerGerrit Code Review <review@openstack.org>2019-01-04 21:06:56 +0000
commit70b92620fff3fb56cd75e76fdd68103930f6f74b (patch)
treefb0c4c312457f230a4f35b6d58072733b81da437
parentd1b2ecfbbe94f4e849029d83c3b9d1b3d7766981 (diff)
parent941354d6cf44911038448953e195a32a55a42762 (diff)
Merge "Move/Drop useless SQL related config options"
-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