commit f3fd44c4be11b53179ff1f227e40c21e9d00721a
author Sean Dague <sdague@linux.vnet.ibm.com> Mon Mar 04 17:33:35 2013 -0500
committer Sean Dague <sdague@linux.vnet.ibm.com> Mon Mar 04 17:52:03 2013 -0500
tree d480e4d9697a923292558aea97fb52617426bfce
parent f90b2740f7f15e7414f7f07ac7566f3c0b5b0e2b

Revert "Enable swift by default."

This reverts commit 5a5cbf7274a6a50bb766ec590cf885430ed5c5d0.

This breaks on a default openstack install on Ubuntu 12.10,
revert for now until this can be cleaned up to work out of the
box.

Change-Id: I185509cc30bd28e920cdab60fc92129949bd6b0d

stack.sh

diff --git a/stack.sh b/stack.sh
index d9fbb94..4035281 100755
--- a/stack.sh
+++ b/stack.sh
@@ -427,7 +427,7 @@
     read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."
 fi
 
-if is_service_enabled s-proxy; then
+if is_service_enabled swift; then
     # If we are using swift3, we can default the s3 port to swift instead
     # of nova-objectstore
     if is_service_enabled swift3;then
@@ -664,12 +664,12 @@
 git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH
 
 # glance, swift middleware and nova api needs keystone middleware
-if is_service_enabled key g-api n-api s-proxy; then
+if is_service_enabled key g-api n-api swift; then
     # unified auth system (manages accounts/tokens)
     install_keystone
 fi
 
-if is_service_enabled s-proxy; then
+if is_service_enabled swift; then
     install_swiftclient
     install_swift
     if is_service_enabled swift3; then
@@ -726,10 +726,10 @@
 configure_keystoneclient
 configure_novaclient
 setup_develop $OPENSTACKCLIENT_DIR
-if is_service_enabled key g-api n-api s-proxy; then
+if is_service_enabled key g-api n-api swift; then
     configure_keystone
 fi
-if is_service_enabled s-proxy; then
+if is_service_enabled swift; then
     configure_swift
     configure_swiftclient
     if is_service_enabled swift3; then
@@ -913,7 +913,7 @@
     init_glance
 
     # Store the images in swift if enabled.
-    if is_service_enabled s-proxy; then
+    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
@@ -972,7 +972,7 @@
 # Storage Service
 # ---------------
 
-if is_service_enabled s-proxy; then
+if is_service_enabled swift; then
     echo_summary "Configuring Swift"
     init_swift
 fi
@@ -1119,7 +1119,7 @@
 # Only run the services specified in ``ENABLED_SERVICES``
 
 # Launch Swift Services
-if is_service_enabled s-proxy; then
+if is_service_enabled swift; then
     echo_summary "Starting Swift"
     start_swift
 fi