Merge pull request #95 from cloudbuilders/simplify
simplify uec image url parsing
diff --git a/exercise.sh b/exercise.sh
index 36a6d6f..7a1ed9b 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -91,14 +91,18 @@
# get the IP of the server
IP=`nova show $NAME | grep "private network" | cut -d"|" -f3`
-# ping it once (timeout of a second)
-ping -c1 -w1 $IP || true
+# for single node deployments, we can ping private ips
+MULTI_HOST=${MULTI_HOST:-0}
+if [ "$MULTI_HOST" = "0"]; then
+ # ping it once (timeout of a second)
+ ping -c1 -w1 $IP || true
-# sometimes the first ping fails (10 seconds isn't enough time for the VM's
-# network to respond?), so let's wait 5 seconds and really test ping
-sleep 5
+ # sometimes the first ping fails (10 seconds isn't enough time for the VM's
+ # network to respond?), so let's wait 5 seconds and really test ping
+ sleep 5
-ping -c1 -w1 $IP
+ ping -c1 -w1 $IP
+fi
# Security Groups & Floating IPs
# ------------------------------
diff --git a/files/apts/nova b/files/apts/nova
index eb85e26..594f2da 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -33,3 +33,7 @@
python-lockfile
python-m2crypto
python-boto
+
+# Stuff for diablo volumes
+iscsitarget
+lvm2
diff --git a/tools/build_kvm.sh b/tools/build_kvm.sh
index dbfb5ce..26a195e 100755
--- a/tools/build_kvm.sh
+++ b/tools/build_kvm.sh
@@ -378,6 +378,10 @@
done
kill $TAIL_PID
+
+ if grep -q "stack.sh failed" $VM_DIR/console.log; then
+ exit 1
+ fi
echo ""
echo "Finished - Zip-a-dee Doo-dah!"
fi