Browse code

Glance: move connection_url from DEFAULT section to DB section

To get rid of Oslo_config deprecation warning.

Change-Id: I9de475f4dea4a4496cc8b5e93aa6928235d4cb29

Jordan Pittier authored on 2015/06/19 18:46:36
Showing 1 changed files
... ...
@@ -107,7 +107,7 @@ function configure_glance {
107 107
     iniset $GLANCE_REGISTRY_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
108 108
     inicomment $GLANCE_REGISTRY_CONF DEFAULT log_file
109 109
     local dburl=`database_connection_url glance`
110
-    iniset $GLANCE_REGISTRY_CONF DEFAULT sql_connection $dburl
110
+    iniset $GLANCE_REGISTRY_CONF database connection $dburl
111 111
     iniset $GLANCE_REGISTRY_CONF DEFAULT use_syslog $SYSLOG
112 112
     iniset $GLANCE_REGISTRY_CONF DEFAULT workers "$API_WORKERS"
113 113
     iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone
... ...
@@ -120,7 +120,7 @@ function configure_glance {
120 120
     cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF
121 121
     iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
122 122
     inicomment $GLANCE_API_CONF DEFAULT log_file
123
-    iniset $GLANCE_API_CONF DEFAULT sql_connection $dburl
123
+    iniset $GLANCE_API_CONF database connection $dburl
124 124
     iniset $GLANCE_API_CONF DEFAULT use_syslog $SYSLOG
125 125
     iniset $GLANCE_API_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
126 126
     iniset $GLANCE_API_CONF paste_deploy flavor keystone+cachemanagement
... ...
@@ -219,7 +219,7 @@ function configure_glance {
219 219
         iniset $GLANCE_SEARCH_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
220 220
         inicomment $GLANCE_SEARCH_CONF DEFAULT log_file
221 221
         iniset $GLANCE_SEARCH_CONF DEFAULT use_syslog $SYSLOG
222
-        iniset $GLANCE_SEARCH_CONF DEFAULT sql_connection $dburl
222
+        iniset $GLANCE_SEARCH_CONF database connection $dburl
223 223
         iniset $GLANCE_SEARCH_CONF paste_deploy flavor keystone
224 224
         configure_auth_token_middleware $GLANCE_SEARCH_CONF glance $GLANCE_AUTH_CACHE_DIR/search
225 225