commit c77b932e16398eebb810501973f6c8a706a3ba58
author Dean Troyer <dtroyer@gmail.com> Fri Mar 29 10:51:01 2013 -0500
committer Dean Troyer <dtroyer@gmail.com> Fri Mar 29 10:51:01 2013 -0500
tree 4fac7403272085c0ed3f67966032d5e49dc3712b
parent 9cb8e57482c6751e1c1c3d752e006828a3d49a67

Move glace's swift config to lib/glance

Change-Id: Icbb355c15bfffe17725ea5cc64cfa5e76c1e74e6

lib/glance

diff --git a/lib/glance b/lib/glance
index edf6982..e9d0562 100644
--- a/lib/glance
+++ b/lib/glance
@@ -116,6 +116,15 @@
     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

stack.sh

diff --git a/stack.sh b/stack.sh
index 0407c30..baf44b0 100755
--- a/stack.sh
+++ b/stack.sh
@@ -826,17 +826,7 @@
 
 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