From 1e069c6be4f6c94ab81af9f588af3c896f0e4360 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Mon, 22 Dec 2014 10:53:47 +0100 Subject: [PATCH] Remove configs sql_connection and sql_connection_debug Both configuration options are available and used from the [database] section under the names 'connection' and 'connection_debug'. Change-Id: I7178ee9fce3b95c887d9b7e5d5564873aae69c88 --- contrib/devstack/lib/manila | 2 +- manila/common/config.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/contrib/devstack/lib/manila b/contrib/devstack/lib/manila index 778ae8597a..48997e71bc 100644 --- a/contrib/devstack/lib/manila +++ b/contrib/devstack/lib/manila @@ -224,7 +224,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 diff --git a/manila/common/config.py b/manila/common/config.py index 83cf19831e..9f575a37d5 100644 --- a/manila/common/config.py +++ b/manila/common/config.py @@ -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.'),