commit dac6e76c3ee5e01e49f38bfe8c75b2e0324c95b0
author Jenkins <jenkins@review.openstack.org> Fri Apr 13 01:13:45 2012 +0000
committer Gerrit Code Review <review@openstack.org> Fri Apr 13 01:13:45 2012 +0000
tree a8c1cb0b482cafadd72f27346fa1021d08ea058f
parent 55e82033c928b68b940f7af74ca8e7df493fe352
parent 9ac2aa4618154384af716f16d41014bd0c60e9f8

Merge "Bumping Horizon Django dependency to v1.4 for Folsom."

stack.sh

diff --git a/stack.sh b/stack.sh
index debbc4e..1d25e4e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -959,6 +959,15 @@
     iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/
     iniset $GLANCE_API_CONF paste_deploy flavor keystone
 
+    # Store the images in swift if enabled.
+    if is_service_enabled swift; 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
+
     GLANCE_API_PASTE_INI=$GLANCE_CONF_DIR/glance-api-paste.ini
     cp $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI
     iniset $GLANCE_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST