Merge "Remove configs sql_connection and sql_connection_debug"
This commit is contained in:
commit
79c8ec5207
@ -237,7 +237,7 @@ function configure_manila {
|
||||
iniset $MANILA_CONF DEFAULT verbose True
|
||||
iniset $MANILA_CONF DEFAULT scheduler_driver $MANILA_SCHEDULER_DRIVER
|
||||
iniset $MANILA_CONF DEFAULT share_name_template ${SHARE_NAME_PREFIX}%s
|
||||
iniset $MANILA_CONF DEFAULT sql_connection `database_connection_url manila`
|
||||
iniset $MANILA_CONF DATABASE connection `database_connection_url manila`
|
||||
iniset $MANILA_CONF DEFAULT api_paste_config $MANILA_API_PASTE_INI
|
||||
iniset $MANILA_CONF DEFAULT rootwrap_config $MANILA_CONF_DIR/rootwrap.conf
|
||||
iniset $MANILA_CONF DEFAULT osapi_share_extension manila.api.contrib.standard_extensions
|
||||
|
@ -52,15 +52,6 @@ def _get_my_ip():
|
||||
|
||||
|
||||
core_opts = [
|
||||
cfg.StrOpt('sql_connection',
|
||||
default='sqlite:///$state_path/$sqlite_db',
|
||||
help='The SQLAlchemy connection string used to connect to the '
|
||||
'database.',
|
||||
secret=True),
|
||||
cfg.IntOpt('sql_connection_debug',
|
||||
default=0,
|
||||
help='Verbosity of SQL debugging information: 0=None, '
|
||||
'100=Everything.'),
|
||||
cfg.StrOpt('api_paste_config',
|
||||
default="api-paste.ini",
|
||||
help='File name for the paste.deploy config for manila-api.'),
|
||||
|
Loading…
Reference in New Issue
Block a user