@@ -116,6 +116,15 @@ function configure_glance() {

     iniset_rpc_backend glance $GLANCE_API_CONF DEFAULT

     iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api

+    # Store the images in swift if enabled.

+    if is_service_enabled s-proxy; then

+        iniset $GLANCE_API_CONF DEFAULT default_store swift

+        iniset $GLANCE_API_CONF DEFAULT swift_store_auth_address $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/

+        iniset $GLANCE_API_CONF DEFAULT swift_store_user $SERVICE_TENANT_NAME:glance

+        iniset $GLANCE_API_CONF DEFAULT swift_store_key $SERVICE_PASSWORD

+        iniset $GLANCE_API_CONF DEFAULT swift_store_create_container_on_put True

+    fi

+

     cp -p $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI

     cp -p $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI

@@ -826,17 +826,7 @@ fi

 if is_service_enabled g-reg; then

     echo_summary "Configuring Glance"

-

     init_glance

-

-    # Store the images in swift if enabled.

-    if is_service_enabled s-proxy; then

-        iniset $GLANCE_API_CONF DEFAULT default_store swift

-        iniset $GLANCE_API_CONF DEFAULT swift_store_auth_address $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/

-        iniset $GLANCE_API_CONF DEFAULT swift_store_user $SERVICE_TENANT_NAME:glance

-        iniset $GLANCE_API_CONF DEFAULT swift_store_key $SERVICE_PASSWORD

-        iniset $GLANCE_API_CONF DEFAULT swift_store_create_container_on_put True

-    fi

 fi