Merge "Move/Drop useless SQL related config options"
This commit is contained in:
commit
70b92620ff
@ -77,22 +77,6 @@ global_opts = [
|
|||||||
cfg.ListOpt('osapi_share_extension',
|
cfg.ListOpt('osapi_share_extension',
|
||||||
default=['manila.api.contrib.standard_extensions'],
|
default=['manila.api.contrib.standard_extensions'],
|
||||||
help='The osapi share extensions to load.'),
|
help='The osapi share extensions to load.'),
|
||||||
cfg.StrOpt('sqlite_db',
|
|
||||||
default='manila.sqlite',
|
|
||||||
help='The filename to use with sqlite.'),
|
|
||||||
cfg.BoolOpt('sqlite_synchronous',
|
|
||||||
default=True,
|
|
||||||
help='If passed, use synchronous mode for sqlite.'),
|
|
||||||
cfg.IntOpt('sql_idle_timeout',
|
|
||||||
default=3600,
|
|
||||||
help='Timeout before idle SQL connections are reaped.'),
|
|
||||||
cfg.IntOpt('sql_max_retries',
|
|
||||||
default=10,
|
|
||||||
help='Maximum database connection retries during startup. '
|
|
||||||
'(setting -1 implies an infinite retry count).'),
|
|
||||||
cfg.IntOpt('sql_retry_interval',
|
|
||||||
default=10,
|
|
||||||
help='Interval between retries of opening a SQL connection.'),
|
|
||||||
cfg.StrOpt('scheduler_manager',
|
cfg.StrOpt('scheduler_manager',
|
||||||
default='manila.scheduler.manager.SchedulerManager',
|
default='manila.scheduler.manager.SchedulerManager',
|
||||||
help='Full class name for the scheduler manager.'),
|
help='Full class name for the scheduler manager.'),
|
||||||
|
@ -48,6 +48,9 @@ test_opts = [
|
|||||||
cfg.StrOpt('sqlite_clean_db',
|
cfg.StrOpt('sqlite_clean_db',
|
||||||
default='clean.sqlite',
|
default='clean.sqlite',
|
||||||
help='File name of clean sqlite database.'),
|
help='File name of clean sqlite database.'),
|
||||||
|
cfg.StrOpt('sqlite_db',
|
||||||
|
default='manila.sqlite',
|
||||||
|
help='The filename to use with sqlite.'),
|
||||||
]
|
]
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
Loading…
Reference in New Issue
Block a user