...
|
...
|
@@ -110,7 +110,7 @@ function configure_glance {
|
110
|
110
|
iniset $GLANCE_REGISTRY_CONF DEFAULT bind_host $GLANCE_SERVICE_LISTEN_ADDRESS
|
111
|
111
|
inicomment $GLANCE_REGISTRY_CONF DEFAULT log_file
|
112
|
112
|
local dburl=`database_connection_url glance`
|
113
|
|
- iniset $GLANCE_REGISTRY_CONF DEFAULT sql_connection $dburl
|
|
113
|
+ iniset $GLANCE_REGISTRY_CONF database connection $dburl
|
114
|
114
|
iniset $GLANCE_REGISTRY_CONF DEFAULT use_syslog $SYSLOG
|
115
|
115
|
iniset $GLANCE_REGISTRY_CONF DEFAULT workers "$API_WORKERS"
|
116
|
116
|
iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone
|
...
|
...
|
@@ -122,7 +122,7 @@ function configure_glance {
|
122
|
122
|
iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
|
123
|
123
|
iniset $GLANCE_API_CONF DEFAULT bind_host $GLANCE_SERVICE_LISTEN_ADDRESS
|
124
|
124
|
inicomment $GLANCE_API_CONF DEFAULT log_file
|
125
|
|
- iniset $GLANCE_API_CONF DEFAULT sql_connection $dburl
|
|
125
|
+ iniset $GLANCE_API_CONF database connection $dburl
|
126
|
126
|
iniset $GLANCE_API_CONF DEFAULT use_syslog $SYSLOG
|
127
|
127
|
iniset $GLANCE_API_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
|
128
|
128
|
iniset $GLANCE_API_CONF paste_deploy flavor keystone+cachemanagement
|
...
|
...
|
@@ -231,7 +231,7 @@ function configure_glance {
|
231
|
231
|
iniset $GLANCE_SEARCH_CONF DEFAULT bind_host $GLANCE_SERVICE_LISTEN_ADDRESS
|
232
|
232
|
inicomment $GLANCE_SEARCH_CONF DEFAULT log_file
|
233
|
233
|
iniset $GLANCE_SEARCH_CONF DEFAULT use_syslog $SYSLOG
|
234
|
|
- iniset $GLANCE_SEARCH_CONF DEFAULT sql_connection $dburl
|
|
234
|
+ iniset $GLANCE_SEARCH_CONF database connection $dburl
|
235
|
235
|
iniset $GLANCE_SEARCH_CONF paste_deploy flavor keystone
|
236
|
236
|
configure_auth_token_middleware $GLANCE_SEARCH_CONF glance $GLANCE_AUTH_CACHE_DIR/search
|
237
|
237
|
|