Merge branch 'image'
diff --git a/stackrc b/stackrc
index c063864..9ba1043 100644
--- a/stackrc
+++ b/stackrc
@@ -1,30 +1,30 @@
# compute service
-NOVA_REPO=git://github.com/cloudbuilders/nova.git
+NOVA_REPO=https://github.com/cloudbuilders/nova.git
NOVA_BRANCH=diablo
# image catalog service
-GLANCE_REPO=git://github.com/cloudbuilders/glance.git
+GLANCE_REPO=https://github.com/cloudbuilders/glance.git
GLANCE_BRANCH=diablo
# unified auth system (manages accounts/tokens)
-KEYSTONE_REPO=git://github.com/cloudbuilders/keystone.git
+KEYSTONE_REPO=https://github.com/cloudbuilders/keystone.git
KEYSTONE_BRANCH=diablo
# a websockets/html5 or flash powered VNC console for vm instances
-NOVNC_REPO=git://github.com/cloudbuilders/noVNC.git
+NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git
NOVNC_BRANCH=diablo
# django powered web control panel for openstack
-DASH_REPO=git://github.com/cloudbuilders/openstack-dashboard.git
+DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git
DASH_BRANCH=diablo
# python client library to nova that dashboard (and others) use
-NOVACLIENT_REPO=git://github.com/rackspace/python-novaclient.git
+NOVACLIENT_REPO=https://github.com/rackspace/python-novaclient.git
NOVACLIENT_BRANCH=master
# openstackx is a collection of extensions to openstack.compute & nova
# that is *deprecated*. The code is being moved into python-novaclient & nova.
-OPENSTACKX_REPO=git://github.com/cloudbuilders/openstackx.git
+OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git
OPENSTACKX_BRANCH=diablo
# Specify a comma-separated list of uec images to download and install into glance.
diff --git a/tools/build_kvm.sh b/tools/build_kvm.sh
index 26a195e..32c7bf6 100755
--- a/tools/build_kvm.sh
+++ b/tools/build_kvm.sh
@@ -235,15 +235,13 @@
# Create our instance fs
qemu-img create -f qcow2 -b $VM_IMAGE disk
-# FIXME: we are sleeping because these qemu commands appear to not complete
-# before they return... We should apply fix that is done in nova's disk.py
-sleep 5
-
-# FIXME: we are sleeping because these qemu commands appear to not complete
-# before they return... We should apply fix that is done in nova's disk.py
+# Connect our nbd and wait till it is mountable
qemu-nbd -c $NBD disk
-
-sleep 5
+NBD_DEV=`basename $NBD`
+if ! timeout 60 sh -c "while ! [ -e /sys/block/$NBD_DEV/pid ]; do sleep 1; done"; then
+ echo "Couldn't connect $NBD"
+ exit 1
+fi
# Mount the instance
mount $NBD $ROOTFS -o offset=32256 -t ext4