commit 1d6e0e196e6f2ee5fef7c5cf2571e4b3ab947300
author Dean Troyer <dtroyer@gmail.com> Fri Dec 23 12:45:13 2011 -0600
committer Dean Troyer <dtroyer@gmail.com> Wed Dec 28 14:20:47 2011 -0600
tree 8ab5fc51826ab5da552b57227501e7df86acb74e
parent c1b2354a88f9d14c6773fe9f9fa06f918e37d8f8

Use DEFAULT_INSTANCE_TYPE in exercises

Change-Id: I5a98a3a4e8057f613a94054b08ff5439f1ccf7cd

exercises/floating_ips.sh

diff --git a/exercises/floating_ips.sh b/exercises/floating_ips.sh
index dca6d5b..135c8c1 100755
--- a/exercises/floating_ips.sh
+++ b/exercises/floating_ips.sh
@@ -67,12 +67,16 @@
 # List of flavors:
 nova flavor-list
 
-# and grab the first flavor in the list to launch
-FLAVOR=`nova flavor-list | head -n 4 | tail -n 1 | cut -d"|" -f2`
+DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny}
+INSTANCE_TYPE=`nova flavor-list | grep $DEFAULT_INSTANCE_TYPE | cut -d"|" -f2`
+if [[ -z "$INSTANCE_TYPE" ]]; then
+    # grab the first flavor in the list to launch if default doesn't exist
+   INSTANCE_TYPE=`nova flavor-list | head -n 4 | tail -n 1 | cut -d"|" -f2`
+fi
 
 NAME="myserver"
 
-nova boot --flavor $FLAVOR --image $IMAGE $NAME --security_groups=$SECGROUP
+nova boot --flavor $INSTANCE_TYPE --image $IMAGE $NAME --security_groups=$SECGROUP
 
 # Testing
 # =======