From d4c420dcfe5b6b799594e721471cb62d53628fe3 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Fri, 13 Apr 2012 09:13:36 -0700
Subject: [PATCH] Remove code that allows use of swift + glance.

 * Removing since it only works with essex, not trunk
 * Reverts https://review.openstack.org/#/c/5988/

Change-Id: Iedcfa536c25d9ee3cc36714aa9028672b2e59a66
---
 stack.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/stack.sh b/stack.sh
index 1d25e4ea4f..debbc4ead3 100755
--- a/stack.sh
+++ b/stack.sh
@@ -959,15 +959,6 @@ if is_service_enabled g-reg; then
     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