From ceca15db4d1d7cf652c25d0339ce90d9aad2b885 Mon Sep 17 00:00:00 2001 From: Jordan Pittier Date: Fri, 19 Jun 2015 11:46:36 +0200 Subject: [PATCH] Glance: move connection_url from DEFAULT section to DB section To get rid of Oslo_config deprecation warning. Change-Id: I9de475f4dea4a4496cc8b5e93aa6928235d4cb29 --- lib/glance | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/glance b/lib/glance index 016ade3479..650028450e 100644 --- a/lib/glance +++ b/lib/glance @@ -107,7 +107,7 @@ function configure_glance { iniset $GLANCE_REGISTRY_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL inicomment $GLANCE_REGISTRY_CONF DEFAULT log_file local dburl=`database_connection_url glance` - iniset $GLANCE_REGISTRY_CONF DEFAULT sql_connection $dburl + iniset $GLANCE_REGISTRY_CONF database connection $dburl iniset $GLANCE_REGISTRY_CONF DEFAULT use_syslog $SYSLOG iniset $GLANCE_REGISTRY_CONF DEFAULT workers "$API_WORKERS" iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone @@ -120,7 +120,7 @@ function configure_glance { cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL inicomment $GLANCE_API_CONF DEFAULT log_file - iniset $GLANCE_API_CONF DEFAULT sql_connection $dburl + iniset $GLANCE_API_CONF database connection $dburl iniset $GLANCE_API_CONF DEFAULT use_syslog $SYSLOG iniset $GLANCE_API_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/ iniset $GLANCE_API_CONF paste_deploy flavor keystone+cachemanagement @@ -219,7 +219,7 @@ function configure_glance { iniset $GLANCE_SEARCH_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL inicomment $GLANCE_SEARCH_CONF DEFAULT log_file iniset $GLANCE_SEARCH_CONF DEFAULT use_syslog $SYSLOG - iniset $GLANCE_SEARCH_CONF DEFAULT sql_connection $dburl + iniset $GLANCE_SEARCH_CONF database connection $dburl iniset $GLANCE_SEARCH_CONF paste_deploy flavor keystone configure_auth_token_middleware $GLANCE_SEARCH_CONF glance $GLANCE_AUTH_CACHE_DIR/search