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

exercises/bundle.sh

diff --git a/exercises/bundle.sh b/exercises/bundle.sh
index 0f128af..a165d55 100755
--- a/exercises/bundle.sh
+++ b/exercises/bundle.sh
@@ -57,7 +57,7 @@
 die_if_not_set AMI "Failure registering $BUCKET/$IMAGE"
 
 # Wait for the image to become available
-if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep '$AMI' | grep 'available'; do sleep 1; done"; then
+if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep $AMI | grep -q available; do sleep 1; done"; then
     echo "Image $AMI not available within $REGISTER_TIMEOUT seconds"
     exit 1
 fi