From 7a549f40f5ce17dbee0274f2e9adc664394b0ab5 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 12 Oct 2011 07:13:13 +0000
Subject: [PATCH 01/19] Prompt users for passwords, and write those passwords
 to localrc

---
 stack.sh | 76 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 57 insertions(+), 19 deletions(-)

diff --git a/stack.sh b/stack.sh
index f6bf534..cdeb8a0 100755
--- a/stack.sh
+++ b/stack.sh
@@ -91,14 +91,14 @@ set -o xtrace
 # This script is customizable through setting environment variables.  If you
 # want to override a setting you can either::
 #
-#     export MYSQL_PASS=anothersecret
+#     export MYSQL_PASSWORD=anothersecret
 #     ./stack.sh
 #
-# You can also pass options on a single line ``MYSQL_PASS=simple ./stack.sh``
+# You can also pass options on a single line ``MYSQL_PASSWORD=simple ./stack.sh``
 #
 # Additionally, you can put any local variables into a ``localrc`` file, like::
 #
-#     MYSQL_PASS=anothersecret
+#     MYSQL_PASSWORD=anothersecret
 #     MYSQL_USER=hellaroot
 #
 # We try to have sensible defaults, so you should be able to run ``./stack.sh``
@@ -111,7 +111,7 @@ set -o xtrace
 #
 # If ``localrc`` exists, then ``stackrc`` will load those settings.  This is 
 # useful for changing a branch or repostiory to test other versions.  Also you
-# can store your other settings like **MYSQL_PASS** or **ADMIN_PASSWORD** instead
+# can store your other settings like **MYSQL_PASSWORD** or **ADMIN_PASSWORD** instead
 # of letting devstack generate random ones for you.
 source ./stackrc
 
@@ -146,6 +146,43 @@ if [ ! -n "$HOST_IP" ]; then
     HOST_IP=`LC_ALL=C /sbin/ifconfig  | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
 fi
 
+# Generic helper to configure passwords
+function read_password {
+    set +o xtrace
+    var=$1; msg=$2
+    pw=${!var}
+
+    # If the password is not defined yet, proceed to prompt user for a password.
+    if [ ! $pw ]; then
+        # If there is no localrc file, create one
+        if [ ! -e localrc ]; then
+            touch localrc
+        fi
+
+        # Presumably if we got this far it can only be that our localrc is missing 
+        # the required password.  Prompt user for a password and write to localrc.
+        if ! grep -q $1 localrc; then
+            echo ''
+            echo '################################################################################'
+            echo $msg
+            echo '################################################################################'
+            echo "This value will be written to your localrc file."
+            echo "It is probably best to avoid spaces and weird characters."
+            echo "If you leave this blank, a random default value will be used."
+            echo "Enter a password now:"
+            read $var
+            pw=${!var}
+            if [ ! $pw ]; then
+                pw=`openssl rand -hex 10`
+            fi
+            eval "$var=$pw"
+            echo "$var=$pw" >> localrc
+        fi
+    fi
+    set -o xtrace
+}
+
+
 # Nova Network Configuration
 # --------------------------
 
@@ -194,31 +231,32 @@ FLAT_INTERFACE=${FLAT_INTERFACE:-eth0}
 
 # By default this script will install and configure MySQL.  If you want to 
 # use an existing server, you can pass in the user/password/host parameters.
-# You will need to send the same ``MYSQL_PASS`` to every host if you are doing
+# You will need to send the same ``MYSQL_PASSWORD`` to every host if you are doing
 # a multi-node devstack installation.
 MYSQL_USER=${MYSQL_USER:-root}
-MYSQL_PASS=${MYSQL_PASS:-`openssl rand -hex 12`}
+read_password MYSQL_PASSWORD "ENTER A PASSWORD TO USE FOR MYSQL."
 MYSQL_HOST=${MYSQL_HOST:-localhost}
 
 # don't specify /db in this string, so we can use it for multiple services
-BASE_SQL_CONN=${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASS@$MYSQL_HOST}
+BASE_SQL_CONN=${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST}
 
 # Rabbit connection info
 RABBIT_HOST=${RABBIT_HOST:-localhost}
 RABBIT_PASSWORD=${RABBIT_PASSWORD:-`openssl rand -hex 12`}
+read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."
 
 # Glance connection info.  Note the port must be specified.
 GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}
 
+
 # Keystone
 # --------
 
 # Service Token - Openstack components need to have an admin token
 # to validate user tokens.
-SERVICE_TOKEN=${SERVICE_TOKEN:-`openssl rand -hex 12`}
+read_password SERVICE_TOKEN "ENTER A SERVICE_TOKEN TO USE FOR THE SERVICE ADMIN TOKEN."
 # Dash currently truncates usernames and passwords at 20 characters
-# so use 10 bytes
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-`openssl rand -hex 10`}
+read_password ADMIN_PASSWORD "ENTER A PASSWORD TO USE FOR DASH AND KEYSTONE (20 CHARS OR LESS)."
 
 
 # Install Packages
@@ -301,15 +339,15 @@ if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then
     # Seed configuration with mysql password so that apt-get install doesn't
     # prompt us for a password upon install.
     cat <<MYSQL_PRESEED | sudo debconf-set-selections
-mysql-server-5.1 mysql-server/root_password password $MYSQL_PASS
-mysql-server-5.1 mysql-server/root_password_again password $MYSQL_PASS
+mysql-server-5.1 mysql-server/root_password password $MYSQL_PASSWORD
+mysql-server-5.1 mysql-server/root_password_again password $MYSQL_PASSWORD
 mysql-server-5.1 mysql-server/start_on_boot boolean true
 MYSQL_PRESEED
 
     # Install and start mysql-server
     sudo apt-get -y -q install mysql-server
     # Update the DB to give user ‘$MYSQL_USER’@’%’ full control of the all databases:
-    sudo mysql -uroot -p$MYSQL_PASS -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' identified by '$MYSQL_PASS';"
+    sudo mysql -uroot -p$MYSQL_PASSWORD -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' identified by '$MYSQL_PASSWORD';"
 
     # Edit /etc/mysql/my.cnf to change ‘bind-address’ from localhost (127.0.0.1) to any (0.0.0.0) and restart the mysql service:
     sudo sed -i 's/127.0.0.1/0.0.0.0/g' /etc/mysql/my.cnf
@@ -360,8 +398,8 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
     mkdir -p $GLANCE_IMAGE_DIR
 
     # (re)create glance database
-    mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE IF EXISTS glance;'
-    mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE glance;'
+    mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS glance;'
+    mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE glance;'
     # Copy over our glance-registry.conf
     GLANCE_CONF=$GLANCE_DIR/etc/glance-registry.conf
     cp $FILES/glance-registry.conf $GLANCE_CONF
@@ -490,8 +528,8 @@ fi
 
 if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then
     # (re)create nova database
-    mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE IF EXISTS nova;'
-    mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE nova;'
+    mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS nova;'
+    mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE nova;'
 
     # (re)create nova database
     $NOVA_DIR/bin/nova-manage db sync
@@ -509,8 +547,8 @@ fi
 
 if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
     # (re)create keystone database
-    mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE IF EXISTS keystone;'
-    mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE keystone;'
+    mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS keystone;'
+    mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE keystone;'
 
     # FIXME (anthony) keystone should use keystone.conf.example
     KEYSTONE_CONF=$KEYSTONE_DIR/etc/keystone.conf

From 6015c82a2b3f0221f1f85e530878d2d0b70a2980 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 12 Oct 2011 07:17:11 +0000
Subject: [PATCH 02/19] use hard path to localrc

---
 stack.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/stack.sh b/stack.sh
index cdeb8a0..32b7a0c 100755
--- a/stack.sh
+++ b/stack.sh
@@ -43,6 +43,9 @@ if [ ! -d $FILES ]; then
     exit 1
 fi
 
+# Keep track of the current working directory.
+CWD=`pwd`
+
 # OpenStack is designed to be run as a regular user (Dashboard will fail to run
 # as root, since apache refused to startup serve content from root user).  If
 # stack.sh is run as root, it automatically creates a stack user with
@@ -152,6 +155,8 @@ function read_password {
     var=$1; msg=$2
     pw=${!var}
 
+    localrc=$CWD/localrc
+
     # If the password is not defined yet, proceed to prompt user for a password.
     if [ ! $pw ]; then
         # If there is no localrc file, create one

From 66b8bbcbd85cefb044a3be54cd84d72fcb6b63be Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 12 Oct 2011 07:21:41 +0000
Subject: [PATCH 03/19] update msg

---
 stack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stack.sh b/stack.sh
index 32b7a0c..68e5afa 100755
--- a/stack.sh
+++ b/stack.sh
@@ -171,7 +171,7 @@ function read_password {
             echo '################################################################################'
             echo $msg
             echo '################################################################################'
-            echo "This value will be written to your localrc file."
+            echo "This value will be written to your localrc file so you don't have to enter it again."
             echo "It is probably best to avoid spaces and weird characters."
             echo "If you leave this blank, a random default value will be used."
             echo "Enter a password now:"

From b4db225494a2c8d19db523c48fc48cbaee0402a0 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 12 Oct 2011 14:08:08 -0700
Subject: [PATCH 04/19] No need to check localrc for password.  Also use
 TOP_DIR as described by smoser.

---
 stack.sh | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/stack.sh b/stack.sh
index 68e5afa..4fbfa28 100755
--- a/stack.sh
+++ b/stack.sh
@@ -43,8 +43,8 @@ if [ ! -d $FILES ]; then
     exit 1
 fi
 
-# Keep track of the current working directory.
-CWD=`pwd`
+# Keep track of the current devstack directory.
+TOP_DIR=$(cd $(dirname "$0") && pwd)
 
 # OpenStack is designed to be run as a regular user (Dashboard will fail to run
 # as root, since apache refused to startup serve content from root user).  If
@@ -155,34 +155,32 @@ function read_password {
     var=$1; msg=$2
     pw=${!var}
 
-    localrc=$CWD/localrc
+    localrc=$TOP_DIR/localrc
 
     # If the password is not defined yet, proceed to prompt user for a password.
     if [ ! $pw ]; then
         # If there is no localrc file, create one
-        if [ ! -e localrc ]; then
-            touch localrc
+        if [ ! -e $localrc ]; then
+            touch $localrc
         fi
 
         # Presumably if we got this far it can only be that our localrc is missing 
         # the required password.  Prompt user for a password and write to localrc.
-        if ! grep -q $1 localrc; then
-            echo ''
-            echo '################################################################################'
-            echo $msg
-            echo '################################################################################'
-            echo "This value will be written to your localrc file so you don't have to enter it again."
-            echo "It is probably best to avoid spaces and weird characters."
-            echo "If you leave this blank, a random default value will be used."
-            echo "Enter a password now:"
-            read $var
-            pw=${!var}
-            if [ ! $pw ]; then
-                pw=`openssl rand -hex 10`
-            fi
-            eval "$var=$pw"
-            echo "$var=$pw" >> localrc
+        echo ''
+        echo '################################################################################'
+        echo $msg
+        echo '################################################################################'
+        echo "This value will be written to your localrc file so you don't have to enter it again."
+        echo "It is probably best to avoid spaces and weird characters."
+        echo "If you leave this blank, a random default value will be used."
+        echo "Enter a password now:"
+        read $var
+        pw=${!var}
+        if [ ! $pw ]; then
+            pw=`openssl rand -hex 10`
         fi
+        eval "$var=$pw"
+        echo "$var=$pw" >> $localrc
     fi
     set -o xtrace
 }

From cf145b77e4dbe675108c2c7b788e7505d5818fed Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Thu, 13 Oct 2011 15:07:36 -0700
Subject: [PATCH 05/19] merge trunk, and also make sure localrc exists before
 running  build_lxc.sh

---
 build_lxc.sh | 9 ++++++++-
 stack.sh     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build_lxc.sh b/build_lxc.sh
index 643da7e..8ca3c41 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -11,6 +11,13 @@ if ! grep -q natty /etc/lsb-release; then
     echo "WARNING: this script has only been tested on natty"
 fi
 
+# Abort if localrc is not set
+if [ ! -e ./localrc ]; then
+    echo "You must have a localrc with ALL necessary passwords defined before proceeding."
+    echo "See stack.sh for required passwords."
+    exit 1
+fi
+
 # Source params
 source ./stackrc
 
@@ -248,4 +255,4 @@ while [ ! -e "$ROOTFS/$DEST/run.sh.log" ]; do
   sleep 1
 done
 
-tail -F $ROOTFS/$DEST/run.sh.log
+tail -F $ROOTFS/$DEST/devstack/stack.sh.*.log
diff --git a/stack.sh b/stack.sh
index 97c39f8..dc151a6 100755
--- a/stack.sh
+++ b/stack.sh
@@ -366,7 +366,7 @@ MYSQL_PRESEED
         cat <<EOF >$HOME/.my.cnf
 [client]
 user=$MYSQL_USER
-password=$MYSQL_PASS    
+password=$MYSQL_PASSWORD
 host=$MYSQL_HOST
 EOF
         chmod 0600 $HOME/.my.cnf

From d1b1cdb04c4ba4e892f4eda722cf3f1daa260865 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Thu, 13 Oct 2011 15:25:38 -0700
Subject: [PATCH 06/19] tail run.sh.log instead of the stack.sh.log

---
 build_lxc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_lxc.sh b/build_lxc.sh
index 8ca3c41..65a06cb 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -255,4 +255,4 @@ while [ ! -e "$ROOTFS/$DEST/run.sh.log" ]; do
   sleep 1
 done
 
-tail -F $ROOTFS/$DEST/devstack/stack.sh.*.log
+tail -F $ROOTFS/$DEST/run.sh.log

From f2b5f8856f98f72fbdaac536387c2c3672dd5e64 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Thu, 13 Oct 2011 16:44:42 -0700
Subject: [PATCH 07/19] starting work to extract image configuration so it
 isn't hard coded

---
 stack.sh | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/stack.sh b/stack.sh
index 0b34790..3330342 100755
--- a/stack.sh
+++ b/stack.sh
@@ -637,36 +637,19 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
     # Downloads the image (ami/aki/ari style), then extracts it.  Upon extraction
     # we upload to glance with the glance cli tool.  TTY is a stripped down 
     # version of ubuntu.
-    if [ ! -f $FILES/tty.tgz ]; then
-        wget -c http://images.ansolabs.com/tty.tgz -O $FILES/tty.tgz
+    IMAGE_URL=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
+    IMAGE_FNAME=`echo "$IMAGE_URL" | python -c "import sys; print sys.stdin.read().split('/')[-1]"`
+    IMAGE_NAME=`echo "$IMAGE_FNAME" | python -c "import sys; print sys.stdin.read().split('.tar.gz')[0].split('.tgz')[0]"`
+    if [ ! -f $FILES/$IMAGE_FNAME ]; then
+        wget -c $IMAGE_URL -O $FILES/$IMAGE_FNAME
     fi
 
     # extract ami-tty/image, aki-tty/image & ari-tty/image
-    tar -zxf $FILES/tty.tgz -C $FILES/images
+    tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images
 
-    # Use glance client to add the kernel, ramdisk and finally the root 
-    # filesystem.  We parse the results of the uploads to get glance IDs of the
-    # ramdisk and kernel and use them for the root filesystem.
-    RVAL=`glance add -A $SERVICE_TOKEN name="tty-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/aki-tty/image`
+    RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*`
     KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
-    RVAL=`glance add -A $SERVICE_TOKEN name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images/ari-tty/image`
-    RAMDISK_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
-    glance add -A $SERVICE_TOKEN name="tty" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID ramdisk_id=$RAMDISK_ID < $FILES/images/ami-tty/image
-
-    # Ubuntu 11.04 aka Natty
-    # ----------------------
-
-    # Downloaded from ubuntu enterprise cloud images.  This
-    # image doesn't use the ramdisk functionality
-    if [ ! -f $FILES/natty.tgz ]; then
-        wget -c http://uec-images.ubuntu.com/natty/current/natty-server-cloudimg-amd64.tar.gz -O $FILES/natty.tgz
-    fi
-    
-    tar -zxf $FILES/natty.tgz -C $FILES/images
-
-    RVAL=`glance add -A $SERVICE_TOKEN name="uec-natty-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/natty-server-cloudimg-amd64-vmlinuz-virtual`
-    KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
-    glance add -A $SERVICE_TOKEN name="uec-natty" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/natty-server-cloudimg-amd64.img
+    glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img
 
 fi
 

From 0ab1d46e05c310a9977aebd3156b5269dffb91fc Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Thu, 13 Oct 2011 23:03:23 -0700
Subject: [PATCH 08/19] Allow user to download and install arbitrary images

---
 stack.sh | 29 +++++++++++++----------------
 stackrc  |  3 +++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/stack.sh b/stack.sh
index 870811b..29f1377 100755
--- a/stack.sh
+++ b/stack.sh
@@ -660,38 +660,35 @@ screen_it dash "cd $DASH_DIR && sudo /etc/init.d/apache2 restart; sudo tail -f /
 # Install Images
 # ==============
 
-# Upload a couple images to glance.  **TTY** is a simple small image that use the 
-# lets you login to it with username/password of user/password.  TTY is useful 
-# for basic functionality.  We all include an Ubuntu cloud build of **Natty**.
-# Natty uses cloud-init, supporting login via keypair and sending scripts as
-# userdata.  
+# Upload an image to glance.
 #
-# Read more about cloud-init at https://help.ubuntu.com/community/CloudInit
+# The default image is a small ***TTY*** testing image, which lets you login
+# the username/password of root/password.
+#
+# TTY also uses cloud-init, supporting login via keypair and sending scripts as
+# userdata.  See https://help.ubuntu.com/community/CloudInit for more on cloud-init
+#
+# Override IMAGE_URL if you would to launch a different image.  Some other options:
+#   natty: http://uec-images.ubuntu.com/natty/current/natty-server-cloudimg-amd64.tar.gz
 
 if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
-    # create a directory for the downloadedthe images tarballs.
+    # Create a directory for the downloadedthe images tarballs.
     mkdir -p $FILES/images
 
-    # Debug Image (TTY)
-    # -----------------
-
-    # Downloads the image (ami/aki/ari style), then extracts it.  Upon extraction
-    # we upload to glance with the glance cli tool.  TTY is a stripped down 
-    # version of ubuntu.
-    IMAGE_URL=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
+    # Downloads the image (uec ami+aki style), then extracts it.
     IMAGE_FNAME=`echo "$IMAGE_URL" | python -c "import sys; print sys.stdin.read().split('/')[-1]"`
     IMAGE_NAME=`echo "$IMAGE_FNAME" | python -c "import sys; print sys.stdin.read().split('.tar.gz')[0].split('.tgz')[0]"`
     if [ ! -f $FILES/$IMAGE_FNAME ]; then
         wget -c $IMAGE_URL -O $FILES/$IMAGE_FNAME
     fi
 
-    # extract ami-tty/image, aki-tty/image & ari-tty/image
+    # Extract ami and aki files
     tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images
 
+    # Upload to glance with the glance cli tool.
     RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*`
     KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
     glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img
-
 fi
 
 # Fin
diff --git a/stackrc b/stackrc
index 15d73ce..9a94721 100644
--- a/stackrc
+++ b/stackrc
@@ -27,6 +27,9 @@ NOVACLIENT_BRANCH=master
 OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git
 OPENSTACKX_BRANCH=diablo
 
+# Specify a uec image to download and install into glance.
+IMAGE_URL=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
+
 # allow local overrides of env variables
 if [ -f ./localrc ]; then
     source ./localrc

From 93947e59be5566391a3fa0a0b32906ce8c4ceffa Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Thu, 13 Oct 2011 23:07:56 -0700
Subject: [PATCH 09/19] improve docs

---
 stack.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stack.sh b/stack.sh
index 29f1377..ea4db93 100755
--- a/stack.sh
+++ b/stack.sh
@@ -685,7 +685,9 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
     # Extract ami and aki files
     tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images
 
-    # Upload to glance with the glance cli tool.
+    # Use glance client to add the kernel the root filesystem.
+    # We parse the results of the first upload to get the glance ID of the
+    # kernel for use when uploading the root filesystem.
     RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*`
     KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
     glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img

From 120f4860cda1a946ebdba1acc03fc09caf2790de Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Fri, 14 Oct 2011 09:31:09 -0700
Subject: [PATCH 10/19] allow multiple images

---
 stack.sh | 34 +++++++++++++++++++---------------
 stackrc  |  4 ++--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/stack.sh b/stack.sh
index ea4db93..b580a4a 100755
--- a/stack.sh
+++ b/stack.sh
@@ -668,29 +668,33 @@ screen_it dash "cd $DASH_DIR && sudo /etc/init.d/apache2 restart; sudo tail -f /
 # TTY also uses cloud-init, supporting login via keypair and sending scripts as
 # userdata.  See https://help.ubuntu.com/community/CloudInit for more on cloud-init
 #
-# Override IMAGE_URL if you would to launch a different image.  Some other options:
+# Override IMAGE_URLS if you would to launch a different image(s).  
+# Specify IMAGE_URLS as a comma-separated list of uec urls.  Some other options include:
 #   natty: http://uec-images.ubuntu.com/natty/current/natty-server-cloudimg-amd64.tar.gz
+#   oneiric: http://uec-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64.tar.gz
 
 if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
     # Create a directory for the downloadedthe images tarballs.
     mkdir -p $FILES/images
 
-    # Downloads the image (uec ami+aki style), then extracts it.
-    IMAGE_FNAME=`echo "$IMAGE_URL" | python -c "import sys; print sys.stdin.read().split('/')[-1]"`
-    IMAGE_NAME=`echo "$IMAGE_FNAME" | python -c "import sys; print sys.stdin.read().split('.tar.gz')[0].split('.tgz')[0]"`
-    if [ ! -f $FILES/$IMAGE_FNAME ]; then
-        wget -c $IMAGE_URL -O $FILES/$IMAGE_FNAME
-    fi
+    for image_url in ${IMAGE_URLS//,/ }; do
+        # Downloads the image (uec ami+aki style), then extracts it.
+        IMAGE_FNAME=`echo "$image_url" | python -c "import sys; print sys.stdin.read().split('/')[-1]"`
+        IMAGE_NAME=`echo "$IMAGE_FNAME" | python -c "import sys; print sys.stdin.read().split('.tar.gz')[0].split('.tgz')[0]"`
+        if [ ! -f $FILES/$IMAGE_FNAME ]; then
+            wget -c $image_url -O $FILES/$IMAGE_FNAME
+        fi
 
-    # Extract ami and aki files
-    tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images
+        # Extract ami and aki files
+        tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images
 
-    # Use glance client to add the kernel the root filesystem.
-    # We parse the results of the first upload to get the glance ID of the
-    # kernel for use when uploading the root filesystem.
-    RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*`
-    KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
-    glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img
+        # Use glance client to add the kernel the root filesystem.
+        # We parse the results of the first upload to get the glance ID of the
+        # kernel for use when uploading the root filesystem.
+        RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*`
+        KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
+        glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img
+    done
 fi
 
 # Fin
diff --git a/stackrc b/stackrc
index 9a94721..e1b65c3 100644
--- a/stackrc
+++ b/stackrc
@@ -27,8 +27,8 @@ NOVACLIENT_BRANCH=master
 OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git
 OPENSTACKX_BRANCH=diablo
 
-# Specify a uec image to download and install into glance.
-IMAGE_URL=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
+# Specify a comma-separated list of uec images to download and install into glance.
+IMAGE_URLS=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
 
 # allow local overrides of env variables
 if [ -f ./localrc ]; then

From 7a8989e9711ec0d3f3401f46a20bdc55c75fd8e9 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Fri, 14 Oct 2011 10:20:30 -0700
Subject: [PATCH 11/19] fix doc

---
 stack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stack.sh b/stack.sh
index b580a4a..a7eacbf 100755
--- a/stack.sh
+++ b/stack.sh
@@ -674,7 +674,7 @@ screen_it dash "cd $DASH_DIR && sudo /etc/init.d/apache2 restart; sudo tail -f /
 #   oneiric: http://uec-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64.tar.gz
 
 if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
-    # Create a directory for the downloadedthe images tarballs.
+    # Create a directory for the downloaded image tarballs.
     mkdir -p $FILES/images
 
     for image_url in ${IMAGE_URLS//,/ }; do

From e8efef79809f8a88910926f4efeb3eb8d6b0ddcd Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Fri, 14 Oct 2011 12:00:50 -0700
Subject: [PATCH 12/19] move lxc to tools

---
 build_lxc.sh => tools/build_lxc.sh                             | 3 +++
 build_lxc_multi.sh => tools/build_lxc_multi.sh                 | 0
 .../lxc_network_hostonlyplusnat.sh                             | 0
 3 files changed, 3 insertions(+)
 rename build_lxc.sh => tools/build_lxc.sh (99%)
 rename build_lxc_multi.sh => tools/build_lxc_multi.sh (100%)
 rename lxc_network_hostonlyplusnat.sh => tools/lxc_network_hostonlyplusnat.sh (100%)

diff --git a/build_lxc.sh b/tools/build_lxc.sh
similarity index 99%
rename from build_lxc.sh
rename to tools/build_lxc.sh
index 65a06cb..d4df344 100755
--- a/build_lxc.sh
+++ b/tools/build_lxc.sh
@@ -11,6 +11,9 @@ if ! grep -q natty /etc/lsb-release; then
     echo "WARNING: this script has only been tested on natty"
 fi
 
+# Move to top devstack dir
+cd ..
+
 # Abort if localrc is not set
 if [ ! -e ./localrc ]; then
     echo "You must have a localrc with ALL necessary passwords defined before proceeding."
diff --git a/build_lxc_multi.sh b/tools/build_lxc_multi.sh
similarity index 100%
rename from build_lxc_multi.sh
rename to tools/build_lxc_multi.sh
diff --git a/lxc_network_hostonlyplusnat.sh b/tools/lxc_network_hostonlyplusnat.sh
similarity index 100%
rename from lxc_network_hostonlyplusnat.sh
rename to tools/lxc_network_hostonlyplusnat.sh

From 9ff71acb08e4885d7da8cb44aedb2ff79f4e0909 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Fri, 14 Oct 2011 15:02:20 -0700
Subject: [PATCH 13/19] make build_lxc.sh work on oneiric

---
 tools/build_lxc.sh | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/tools/build_lxc.sh b/tools/build_lxc.sh
index d4df344..507f93e 100755
--- a/tools/build_lxc.sh
+++ b/tools/build_lxc.sh
@@ -6,10 +6,8 @@ if [ "$EUID" -ne "0" ]; then
   exit 1
 fi
 
-# Warn users who aren't on natty
-if ! grep -q natty /etc/lsb-release; then
-    echo "WARNING: this script has only been tested on natty"
-fi
+# Keep track of ubuntu version
+UBUNTU_VERSION=`cat /etc/lsb-release | grep CODENAME | sed 's/.*=//g'`
 
 # Move to top devstack dir
 cd ..
@@ -92,8 +90,21 @@ function git_clone {
     fi
 }
 
+# Helper to create the container
+function create_lxc {
+    if [ "natty" = "$UBUNTU_VERSION" ]; then
+        lxc-create -n $CONTAINER -t natty -f $LXC_CONF
+    else
+        lxc-create -n $CONTAINER -t ubuntu -f $LXC_CONF
+    fi
+}
+
 # Location of the base image directory
-CACHEDIR=/var/cache/lxc/natty/rootfs-amd64
+if [ "natty" = "$UBUNTU_VERSION" ]; then
+    CACHEDIR=/var/cache/lxc/natty/rootfs-amd64
+else
+    CACHEDIR=/var/cache/lxc/oneiric/rootfs-amd64
+fi
 
 # Provide option to do totally clean install
 if [ "$CLEAR_LXC_CACHE" = "1" ]; then
@@ -106,7 +117,7 @@ if [ ! -f $CACHEDIR/bootstrapped ]; then
     # lazy and doesn't do anything if a container already exists)
     lxc-destroy -n $CONTAINER
     # trigger the initial debootstrap
-    lxc-create -n $CONTAINER -t natty -f $LXC_CONF
+    create_lxc
     chroot $CACHEDIR apt-get update
     chroot $CACHEDIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`
     chroot $CACHEDIR pip install `cat files/pips/*`
@@ -143,7 +154,7 @@ if [ "$TERMINATE" = "1" ]; then
 fi
 
 # Create the container
-lxc-create -n $CONTAINER -t natty -f $LXC_CONF
+create_lxc
 
 # Specify where our container rootfs lives
 ROOTFS=/var/lib/lxc/$CONTAINER/rootfs/
@@ -207,6 +218,10 @@ cat > $RUN_SH <<EOF
 #!/usr/bin/env bash
 # Make sure dns is set up
 echo "nameserver $NAMESERVER" | sudo resolvconf -a eth0
+# Make there is a default route - needed for natty
+if ! route | grep -q default; then
+    sudo ip route add default via $CONTAINER_GATEWAY
+fi
 sleep 1
 
 # Kill any existing screens
@@ -218,7 +233,7 @@ sudo apt-get -y --force-yes install git-core vim-nox sudo
 if [ ! -d "$DEST/devstack" ]; then
     git clone git://github.com/cloudbuilders/devstack.git $DEST/devstack
 fi
-cd $DEST/devstack && $STACKSH_PARAMS ./stack.sh > /$DEST/run.sh.log
+cd $DEST/devstack && $STACKSH_PARAMS FORCE=yes ./stack.sh > /$DEST/run.sh.log
 echo >> /$DEST/run.sh.log
 echo >> /$DEST/run.sh.log
 echo "All done! Time to start clicking." >> /$DEST/run.sh.log
@@ -228,11 +243,13 @@ EOF
 chmod 755 $RUN_SH
 
 # Make runner launch on boot
-RC_LOCAL=$ROOTFS/etc/rc.local
+RC_LOCAL=$ROOTFS/etc/init.d/local
 cat > $RC_LOCAL <<EOF
 #!/bin/sh -e
 su -c "$DEST/run.sh" stack
 EOF
+chmod +x $RC_LOCAL
+chroot $ROOTFS sudo update-rc.d local defaults 80
 
 # Configure cgroup directory
 if ! mount | grep -q cgroup; then

From 25369c914aa928de1ce67b9dec56aa5e0c2b782f Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Fri, 14 Oct 2011 16:50:27 -0700
Subject: [PATCH 14/19] make tail stop when stack.sh is finished

---
 tools/build_lxc.sh | 49 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/tools/build_lxc.sh b/tools/build_lxc.sh
index 507f93e..42bd328 100755
--- a/tools/build_lxc.sh
+++ b/tools/build_lxc.sh
@@ -35,6 +35,7 @@ CONTAINER_GATEWAY=${CONTAINER_GATEWAY:-192.168.1.1}
 NAMESERVER=${NAMESERVER:-$CONTAINER_GATEWAY}
 COPYENV=${COPYENV:-1}
 DEST=${DEST:-/opt/stack}
+WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1}
 
 # Param string to pass to stack.sh.  Like "EC2_DMZ_HOST=192.168.1.1 MYSQL_USER=nova"
 STACKSH_PARAMS=${STACKSH_PARAMS:-}
@@ -260,19 +261,39 @@ fi
 # Start our container
 lxc-start -d -n $CONTAINER
 
-# Done creating the container, let's tail the log
-echo
-echo "============================================================="
-echo "                          -- YAY! --"
-echo "============================================================="
-echo
-echo "We're done creating the container, about to start tailing the"
-echo "stack.sh log. It will take a second or two to start."
-echo
-echo "Just CTRL-C at any time to stop tailing."
+if [ "$WAIT_TILL_LAUNCH" = "1" ]; then
+    # Done creating the container, let's tail the log
+    echo
+    echo "============================================================="
+    echo "                          -- YAY! --"
+    echo "============================================================="
+    echo
+    echo "We're done creating the container, about to start tailing the"
+    echo "stack.sh log. It will take a second or two to start."
+    echo
+    echo "Just CTRL-C at any time to stop tailing."
 
-while [ ! -e "$ROOTFS/$DEST/run.sh.log" ]; do
-  sleep 1
-done
+    while [ ! -e "$ROOTFS/$DEST/run.sh.log" ]; do
+      sleep 1
+    done
 
-tail -F $ROOTFS/$DEST/run.sh.log
+    tail -F $ROOTFS/$DEST/run.sh.log &
+
+    TAIL_PID=$!
+
+    function kill_tail() {
+        exit 1
+    }
+ 
+    # Let Ctrl-c kill tail and exit
+    trap kill_tail SIGINT
+
+    echo "Waiting stack.sh to finish..."
+    while ! cat $ROOTFS/$DEST/run.sh.log | grep -q 'All done' ; do
+        sleep 5
+    done
+
+    kill $TAIL_PID
+    echo ""
+    echo "Finished - Zip-a-dee Doo-dah!"
+fi

From f43307d408924977a2603d5e4f4aa30f41dfe4fc Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sat, 15 Oct 2011 17:40:38 -0700
Subject: [PATCH 15/19] exercise.sh was using wrong variable to generate token

---
 exercise.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercise.sh b/exercise.sh
index d9d4c0a..c791601 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -55,7 +55,7 @@ export NOVA_REGION_NAME=RegionOne
 
 # Get a token for clients that don't support service catalog
 # ==========================================================
-SERVICE_TOKEN=`curl -s -d  "{\"auth\":{\"passwordCredentials\": {\"username\": \"$NOVA_PROJECT_ID\", \"password\": \"$NOVA_API_KEY\"}}}" -H "Content-type: application/json" http://$HOST:5000/v2.0/tokens | python -c "import sys; import json; tok = json.loads(sys.stdin.read()); print tok['access']['token']['id'];"`
+SERVICE_TOKEN=`curl -s -d  "{\"auth\":{\"passwordCredentials\": {\"username\": \"$NOVA_USERNAME\", \"password\": \"$NOVA_API_KEY\"}}}" -H "Content-type: application/json" http://$HOST:5000/v2.0/tokens | python -c "import sys; import json; tok = json.loads(sys.stdin.read()); print tok['access']['token']['id'];"`
 
 # Launching a server
 # ==================

From b9c77d69a6be25bca73780df671ab7538997e1ac Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sat, 15 Oct 2011 18:37:25 -0700
Subject: [PATCH 16/19] add debug logging and notes about generating token

---
 exercise.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/exercise.sh b/exercise.sh
index c791601..f8c82d0 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -52,10 +52,17 @@ export NOVA_VERSION=1.1
 # FIXME - why does this need to be specified?
 export NOVA_REGION_NAME=RegionOne
 
+# set log level to DEBUG (helps debug issues)
+export NOVACLIENT_DEBUG=1
 
 # Get a token for clients that don't support service catalog
 # ==========================================================
-SERVICE_TOKEN=`curl -s -d  "{\"auth\":{\"passwordCredentials\": {\"username\": \"$NOVA_USERNAME\", \"password\": \"$NOVA_API_KEY\"}}}" -H "Content-type: application/json" http://$HOST:5000/v2.0/tokens | python -c "import sys; import json; tok = json.loads(sys.stdin.read()); print tok['access']['token']['id'];"`
+
+# manually create a token by querying keystone (sending JSON data).  Keystone 
+# returns a token and catalog of endpoints.  We use python to parse the token
+# and save it.
+
+TOKEN=`curl -s -d  "{\"auth\":{\"passwordCredentials\": {\"username\": \"$NOVA_USERNAME\", \"password\": \"$NOVA_API_KEY\"}}}" -H "Content-type: application/json" http://$HOST:5000/v2.0/tokens | python -c "import sys; import json; tok = json.loads(sys.stdin.read()); print tok['access']['token']['id'];"`
 
 # Launching a server
 # ==================

From 4e8847cd6a8bb4dce9c3a7c66636d61ba51b519c Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sat, 15 Oct 2011 19:29:55 -0700
Subject: [PATCH 17/19] update glance command in exercise.sh

---
 exercise.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercise.sh b/exercise.sh
index f8c82d0..30f0d7d 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -80,7 +80,7 @@ nova flavor-list
 nova image-list
 
 # But we recommend using glance directly
-glance -A $SERVICE_TOKEN index
+glance -A $TOKEN index
 
 # show details of the active servers::
 #

From d888e1cdcb7eadf6c6b3634631400a4fe4c97769 Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sat, 15 Oct 2011 20:01:12 -0700
Subject: [PATCH 18/19] update exercise to boot a server, ping it, then destroy
 it

---
 exercise.sh | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/exercise.sh b/exercise.sh
index 30f0d7d..84679f2 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -70,9 +70,6 @@ TOKEN=`curl -s -d  "{\"auth\":{\"passwordCredentials\": {\"username\": \"$NOVA_U
 # List servers for tenant:
 nova list
 
-# List of flavors:
-nova flavor-list
-
 # Images
 # ------
 
@@ -82,8 +79,38 @@ nova image-list
 # But we recommend using glance directly
 glance -A $TOKEN index
 
-# show details of the active servers::
-#
-#     nova show 1234
-#
-nova list | grep ACTIVE | cut -d \| -f2 | xargs -n1 nova show
+# Let's grab the id of the first AMI image to launch
+IMAGE=`glance -A $TOKEN index | egrep ami | cut -d" " -f1`
+
+
+# Flavors
+# -------
+
+# 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`
+
+NAME="firstpost"
+
+nova boot --flavor $FLAVOR --image $IMAGE $NAME
+
+# let's give it 10 seconds to launch
+sleep 10
+
+# check that the status is active
+nova show $NAME | grep status | grep -q ACTIVE
+
+# 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
+
+# shutdown the server
+nova delete $NAME
+
+# FIXME: validate shutdown within 5 seconds 
+# (nova show $NAME returns 1 or status != ACTIVE)?
+

From da89268c9272e5e649d7d2332c86bf2fe68f57ee Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sat, 15 Oct 2011 20:14:07 -0700
Subject: [PATCH 19/19] update the ping to ping, wait 5 second, really ping

---
 exercise.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/exercise.sh b/exercise.sh
index 84679f2..dc8163f 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -106,7 +106,13 @@ nova show $NAME | grep status | grep -q ACTIVE
 IP=`nova show $NAME | grep "private network" | cut -d"|" -f3`
 
 # ping it once (timeout of a second)
-ping -c1 -w1 $IP
+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
+
+ping -c1 -w1 $IP 
 
 # shutdown the server
 nova delete $NAME