openstack/devstack
Code Issues Proposed changes

working build_kvm

Browse Source
This commit is contained in:
Anthony Young 2011-10-19 20:09:43 -07:00
parent 67243cebe1
commit d51812d444
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/build_kvm.sh
View File

@ -176,7 +176,6 @@ cat > $LIBVIRT_XML <<EOF
<memory>1524288</memory> <memory>1524288</memory>
<os> <os>
<type>hvm</type> <type>hvm</type>
<boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>
</os> </os>
<features> <features>
@ -287,6 +286,7 @@ cd $DEST/devstack && $STACKSH_PARAMS FORCE=yes ./stack.sh > /$DEST/run.sh.log
echo >> /$DEST/run.sh.log echo >> /$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 echo "All done! Time to start clicking." >> /$DEST/run.sh.log
cat $DEST/run.sh.log
EOF EOF
chmod 755 $RUN_SH chmod 755 $RUN_SH
@ -297,13 +297,14 @@ cat > $RC_LOCAL <<EOF
# Reboot if this is our first run to enable console log on natty :( # Reboot if this is our first run to enable console log on natty :(
if [ ! -e /root/firstlaunch ]; then if [ ! -e /root/firstlaunch ]; then
touch /root/firstlaunch touch /root/firstlaunch
# reboot reboot -f
exit 0 exit 0
fi fi
su -c "$DEST/run.sh" stack su -c "$DEST/run.sh" stack
EOF EOF
chmod +x $RC_LOCAL chmod +x $RC_LOCAL
chroot $ROOTFS sudo update-rc.d local defaults 80 chroot $ROOTFS sudo update-rc.d local defaults 80
#chroot $ROOTFS update-rc.d local start 80 2 . stop 80 0 1 6
# Make our ip address hostnames look nice at the command prompt # Make our ip address hostnames look nice at the command prompt
echo "export PS1='${debian_chroot:+($debian_chroot)}\\u@\\H:\\w\\$ '" >> $ROOTFS/$DEST/.bashrc echo "export PS1='${debian_chroot:+($debian_chroot)}\\u@\\H:\\w\\$ '" >> $ROOTFS/$DEST/.bashrc
@ -314,6 +315,8 @@ chroot $ROOTFS chown -R stack $DEST
# Change boot params so that we get a console log # Change boot params so that we get a console log
sudo sed -e "s/quiet splash/splash console=ttyS0 console=ttyS1,19200n8/g" -i $ROOTFS/boot/grub/menu.lst sudo sed -e "s/quiet splash/splash console=ttyS0 console=ttyS1,19200n8/g" -i $ROOTFS/boot/grub/menu.lst
sudo sed -e "s/^hiddenmenu//g" -i $ROOTFS/boot/grub/menu.lst
#chroot $ROOTFS grub-install /dev/vda
# Unmount # Unmount
umount $ROOTFS || echo 'ok' umount $ROOTFS || echo 'ok'
@ -323,7 +326,7 @@ qemu-nbd -d /dev/nbd5
cd $VM_DIR && virsh create libvirt.xml cd $VM_DIR && virsh create libvirt.xml
# Tail the console log till we are done # Tail the console log till we are done
WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-0} WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1}
if [ "$WAIT_TILL_LAUNCH" = "1" ]; then if [ "$WAIT_TILL_LAUNCH" = "1" ]; then
# Done creating the container, let's tail the log # Done creating the container, let's tail the log
echo echo
@ -353,7 +356,7 @@ if [ "$WAIT_TILL_LAUNCH" = "1" ]; then
trap kill_tail SIGINT trap kill_tail SIGINT
echo "Waiting stack.sh to finish..." echo "Waiting stack.sh to finish..."
while ! cat $VM_DIR/console.log | grep -q 'stack.sh completed' ; do while ! cat $VM_DIR/console.log | grep -q 'All done' ; do
sleep 5 sleep 5
done done