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

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index eea2c4d..2580351 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -146,7 +146,7 @@
         cp -p $FILES/default_catalog.templates $KEYSTONE_CATALOG
 
         # Add swift endpoints to service catalog if swift is enabled
-        if is_service_enabled s-proxy; then
+        if is_service_enabled swift; then
             echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG
             echo "catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/" >> $KEYSTONE_CATALOG
             echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG