Skip to content

Commit d4c420d

Browse files
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
1 parent dac6e76 commit d4c420d

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

stack.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -959,15 +959,6 @@ if is_service_enabled g-reg; then
959959
iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/
960960
iniset $GLANCE_API_CONF paste_deploy flavor keystone
961961

962-
# Store the images in swift if enabled.
963-
if is_service_enabled swift; then
964-
iniset $GLANCE_API_CONF DEFAULT default_store swift
965-
iniset $GLANCE_API_CONF DEFAULT swift_store_auth_address $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/
966-
iniset $GLANCE_API_CONF DEFAULT swift_store_user $SERVICE_TENANT_NAME:glance
967-
iniset $GLANCE_API_CONF DEFAULT swift_store_key $SERVICE_PASSWORD
968-
iniset $GLANCE_API_CONF DEFAULT swift_store_create_container_on_put True
969-
fi
970-
971962
GLANCE_API_PASTE_INI=$GLANCE_CONF_DIR/glance-api-paste.ini
972963
cp $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI
973964
iniset $GLANCE_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST

0 commit comments

Comments
 (0)