josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

re-order cleanup calls

Browse source
This commit is contained in:
Anthony Young 2011-10-20 12:32:58 -07:00
parent 637475815b
commit babb2e075a
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/build_kvm.sh
View file

@ -148,18 +148,11 @@ git_clone $OPENSTACKX_REPO $COPY_DIR/$DEST/openstackx $OPENSTACKX_BRANCH
git_clone $KEYSTONE_REPO $COPY_DIR/$DEST/keystone $KEYSTONE_BRANCH git_clone $KEYSTONE_REPO $COPY_DIR/$DEST/keystone $KEYSTONE_BRANCH
git_clone $NOVNC_REPO $COPY_DIR/$DEST/noVNC $NOVNC_BRANCH git_clone $NOVNC_REPO $COPY_DIR/$DEST/noVNC $NOVNC_BRANCH
# Back to devstack
cd $TOP_DIR
# Unmount the filesystems # Unmount the filesystems
unmount_images unmount_images
# Clean up old runs # Back to devstack
cd $VM_DIR cd $TOP_DIR
rm -f $VM_DIR/disk
# Clean up old instance data
qemu-img create -f qcow2 -b $BASE_IMAGE_COPY disk
# Network configuration variables # Network configuration variables
BRIDGE=${BRIDGE:-br0} BRIDGE=${BRIDGE:-br0}
@ -231,6 +224,14 @@ NBD=${NBD:-/dev/nbd5}
umount $ROOTFS || echo 'ok' umount $ROOTFS || echo 'ok'
qemu-nbd -d $NBD || echo 'ok' qemu-nbd -d $NBD || echo 'ok'
# Clean up old runs
cd $VM_DIR
rm -f $VM_DIR/disk
# Create our instance fs
qemu-img create -f qcow2 -b $BASE_IMAGE_COPY disk
# Mount the instance # Mount the instance
qemu-nbd -c $NBD disk qemu-nbd -c $NBD disk
mount $NBD $ROOTFS -o offset=32256 -t ext4 mount $NBD $ROOTFS -o offset=32256 -t ext4