commit 77b0e1d8ff9617dc71cf92a7a9d7fb850e2e5998
author Chmouel Boudjnah <chmouel@chmouel.com> Wed Feb 29 16:55:43 2012 +0000
committer Vishvananda Ishaya <vishvananda@gmail.com> Thu Mar 15 20:59:45 2012 +0000
tree b640770acca70e2820a98f06668c0e458fd3e90d
parent 737320f9998c90f0175bccb38042da2c6f2c7034

Converts bundle exercise to use swift/s3

- Fix keystone s3token configuration (in admin api not public api).
- Set s3 service in keystone to swift if installed.
- Fixes a bug in bundle.sh
- Adds config options for nova to use swift as s3 store

Change-Id: Ic2fca5aba06a25c0b3a74f1e97d062390a8e2ab1

files/default_catalog.templates

diff --git a/files/default_catalog.templates b/files/default_catalog.templates
index 7a98c94..31618ab 100644
--- a/files/default_catalog.templates
+++ b/files/default_catalog.templates
@@ -24,9 +24,9 @@
 catalog.RegionOne.ec2.name = EC2 Service
 
 
-catalog.RegionOne.s3.publicURL = http://%SERVICE_HOST%:3333
-catalog.RegionOne.s3.adminURL = http://%SERVICE_HOST%:3333
-catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:3333
+catalog.RegionOne.s3.publicURL = http://%SERVICE_HOST%:%S3_SERVICE_PORT%
+catalog.RegionOne.s3.adminURL = http://%SERVICE_HOST%:%S3_SERVICE_PORT%
+catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:%S3_SERVICE_PORT%
 catalog.RegionOne.s3.name = S3 Service