openstack/manila
Code Issues Proposed changes

Remove configs sql_connection and sql_connection_debug

Browse Source 
Both configuration options are available and used from the [database]
section under the names 'connection' and 'connection_debug'.

Change-Id: I7178ee9fce3b95c887d9b7e5d5564873aae69c88
This commit is contained in:
Thomas Bechtold 2014-12-22 10:53:47 +01:00
parent cc2825fb77
commit 1e069c6be4
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/devstack/lib/manila
View File

@ -224,7 +224,7 @@ function configure_manila {
iniset $MANILA_CONF DEFAULT verbose True iniset $MANILA_CONF DEFAULT verbose True
iniset $MANILA_CONF DEFAULT scheduler_driver $MANILA_SCHEDULER_DRIVER iniset $MANILA_CONF DEFAULT scheduler_driver $MANILA_SCHEDULER_DRIVER
iniset $MANILA_CONF DEFAULT share_name_template ${SHARE_NAME_PREFIX}%s 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 api_paste_config $MANILA_API_PASTE_INI
iniset $MANILA_CONF DEFAULT rootwrap_config $MANILA_CONF_DIR/rootwrap.conf iniset $MANILA_CONF DEFAULT rootwrap_config $MANILA_CONF_DIR/rootwrap.conf
iniset $MANILA_CONF DEFAULT osapi_share_extension manila.api.contrib.standard_extensions iniset $MANILA_CONF DEFAULT osapi_share_extension manila.api.contrib.standard_extensions

9
manila/common/config.py
View File

@ -52,15 +52,6 @@ def _get_my_ip():
core_opts = [ 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', cfg.StrOpt('api_paste_config',
default="api-paste.ini", default="api-paste.ini",
help='File name for the paste.deploy config for manila-api.'), help='File name for the paste.deploy config for manila-api.'),