1. devstack
  2. Commit 2a9900d8f21ec4d5a77893cab931c4fb03851c52
Browse code

Merge "Glance should not reference Cinder v1"

Zuul authored on 2019/02/14 20:23:23
Showing 1 changed files
lib/glance
History View file @ 2a9900d
... ... 
@@ -236,8 +236,8 @@ function configure_glance {
236 236 
         CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
237 237 
         CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
238 238
239 
-        iniset $GLANCE_API_CONF DEFAULT cinder_endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
240 
-        iniset $GLANCE_CACHE_CONF DEFAULT cinder_endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
239 
+        iniset $GLANCE_API_CONF DEFAULT cinder_endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/%(project_id)s"
240 
+        iniset $GLANCE_CACHE_CONF DEFAULT cinder_endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v3/%(project_id)s"
241 241 
     fi
242 242
243 243 
     if [[ "$WSGI_MODE" == "uwsgi" ]]; then