@@ -1,4 +1,5 @@

 #!/usr/bin/env bash

+

 # Configurable params

 BRIDGE=${BRIDGE:-br0}

 CONTAINER=${CONTAINER:-STACK}

@@ -49,9 +50,13 @@ if [ -d /cgroup/$CONTAINER ]; then

     cgdelete -r cpu,net_cls:$CONTAINER

 fi

+

 # Warm the base image on first install

 CACHEDIR=/var/cache/lxc/natty/rootfs-amd64

 if [ ! -d $CACHEDIR ]; then

+    # by deleting the container, we force lxc-create to re-bootstrap (lxc is

+    # 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

     chroot $CACHEDIR apt-get update

@@ -61,14 +61,8 @@ QUANTUM_PORT = '9696'

 QUANTUM_TENANT = '1234'

 QUANTUM_CLIENT_VERSION='0.1'

-# If you have external monitoring links

-EXTERNAL_MONITORING = [

-    ['Nagios','http://foo.com'],

-    ['Ganglia','http://bar.com'],

-]

-

-# If you do not have external monitoring links

-# EXTERNAL_MONITORING = []

+# We use nixon to embed instead of external monitoring links

+EXTERNAL_MONITORING = []

 # Uncomment the following segment to silence most logging

 # django.db and boto DEBUG logging is extremely verbose.

@@ -293,7 +293,7 @@ if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then

     # qcow images) and kvm (hardware based virtualization).  If unable to 

     # load kvm, set the libvirt type to qemu.

     sudo modprobe nbd || true

-    if ! sudo modprobe kvm; then

+    if ! -e /dev/kvm; then

         LIBVIRT_TYPE=qemu

     fi

     # User needs to be member of libvirtd group for nova-compute to use libvirt.

@@ -408,10 +408,33 @@ function screen_it {

 screen -d -m -S nova -t nova

 sleep 1

-screen_it g-api "cd $GLANCE_DIR; bin/glance-api --config-file=etc/glance-api.conf"

-screen_it g-reg "cd $GLANCE_DIR; bin/glance-registry --config-file=etc/glance-registry.conf"

-screen_it key "$KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF"

-screen_it n-api "$NOVA_DIR/bin/nova-api"

+if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then

+    screen_it g-reg "cd $GLANCE_DIR; bin/glance-registry --config-file=etc/glance-registry.conf"

+fi

+

+if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then

+    screen_it g-api "cd $GLANCE_DIR; bin/glance-api --config-file=etc/glance-api.conf"

+    while ! wget -q -O- http://$GLANCE_HOSTPORT; do

+        echo "Waiting for g-api ($GLANCE_HOSTPORT) to start..."

+        sleep 1

+    done

+fi

+

+if [[ "$ENABLED_SERVICES" =~ "key" ]]; then

+    screen_it key "$KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF"

+    while ! wget -q -O- http://127.0.0.1:5000; do

+        echo "Waiting for keystone to start..."

+        sleep 1

+    done

+fi

+

+if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then

+    screen_it n-api "$NOVA_DIR/bin/nova-api"

+    while ! wget -q -O- http://127.0.0.1:8774; do

+        echo "Waiting for nova-api to start..."

+        sleep 1

+    done

+fi

 # Launching nova-compute should be as simple as running ``nova-compute`` but 

 # have to do a little more than that in our script.  Since we add the group 

 # ``libvirtd`` to our user in this script, when nova-compute is run it is