diff --git a/README b/README index c30f61c193..299bd6cc6b 100644 --- a/README +++ b/README @@ -9,7 +9,6 @@ Tool to build (nfs export) openstack dev environments * check openstack-puppet recipes to see if anything else is missing * allow rabbit connection to be specified via environment variables with sensible defaults * Add volume support -* extract image upload to a seperate script that supports generating images via debootstrap (ubuntu-vm-builder?) * allow changing of git locations (specify different tag/branch or repos) * change method of invoking stack.sh to ./stack.sh all _or_ ./stack.sh nova-compute,nova-network,nova-api,nova-volume * Add quantum support @@ -19,6 +18,7 @@ Tool to build (nfs export) openstack dev environments * sqlconn can be set via env * move back to using sudo * move nova to mysql +* create images via vmbuilder and upload images via glance # Future diff --git a/make_image.sh b/make_image.sh index 9b5c10c390..28b2eac23d 100755 --- a/make_image.sh +++ b/make_image.sh @@ -19,14 +19,14 @@ usage() { while getopts hm:r:s: c; do case $c in - h) usage - ;; - m) MIRROR=$OPTARG - ;; - r) ROOTSIZE=$OPTARG - ;; - s) SWAPSIZE=$OPTARG - ;; + h) usage + ;; + m) MIRROR=$OPTARG + ;; + r) ROOTSIZE=$OPTARG + ;; + s) SWAPSIZE=$OPTARG + ;; esac done shift `expr $OPTIND - 1` @@ -34,38 +34,43 @@ shift `expr $OPTIND - 1` RELEASE=$1 FORMAT=$2 -case $RELEASE in - natty) ;; - maverick) ;; - lucid) ;; - karmic) ;; - jaunty) ;; - *) echo "Unknown release: $RELEASE" - usage +case $FORMAT in + kvm|qcow2) FORMAT=qcow2 + TARGET=kvm + ;; + vmserver|vmdk) + FORMAT=vmdk + TARGET=vmserver + ;; + vbox|vdi) FORMAT=qcow2 + TARGET=kvm + FINAL_FORMAT=vdi + ;; + vhd|vpc) FORMAT=qcow2 + TARGET=kvm + FINAL_FORMAT=vhd + ;; + xen) FORMAT=raw + TARGET=xen + ;; + *) echo "Unknown format: $FORMAT" + usage esac -case $FORMAT in - kvm|qcow2) FORMAT=qcow2 - TARGET=kvm - ;; - vmserver|vmdk) FORMAT=vmdk - TARGET=vmserver - ;; - vbox|vdi) FORMAT=qcow2 - TARGET=kvm - FINAL_FORMAT=vdi - ;; - vhd|vpc) FORMAT=qcow2 - TARGET=kvm - FINAL_FORMAT=vpc - ;; - *) echo "Unknown format: $FORMAT" - usage +case $RELEASE in + natty) ;; + maverick) ;; + lucid) ;; + karmic) ;; + jaunty) ;; + *) echo "Unknown release: $RELEASE" + usage + ;; esac # Install stuff if necessary if [ -z `which vmbuilder` ]; then - sudo apt-get install ubuntu-vm-builder + sudo apt-get install ubuntu-vm-builder fi # Build the image @@ -83,6 +88,10 @@ if [ -z "$FINAL_FORMAT" ]; then mv ubuntu-$TARGET/tmp*.$FORMAT $RELEASE.$FORMAT else # Convert image - qemu-img convert -O $FINAL_FORMAT ubuntu-$TARGET/tmp*.$FORMAT $RELEASE.$FINAL_FORMAT + tgt=$FINAL_FORMAT + if [ "$tgt" = "vhd" ]; then + tgt=vpc + fi + qemu-img convert -O $tgt ubuntu-$TARGET/tmp*.$FORMAT $RELEASE.$FINAL_FORMAT fi rm -rf ubuntu-$TARGET diff --git a/upload_image.sh b/upload_image.sh index 8436b763ff..39a2fba1e9 100755 --- a/upload_image.sh +++ b/upload_image.sh @@ -1,30 +1,24 @@ #!/bin/bash # upload_image.sh - Upload Ubuntu images (create if necessary) in various formats -# -# upload_image.sh release format -# -# format target -# qcow2 kvm,qemu -# vmdk vmw6 -# vbox vdi -# vhd vpc - -HOST=${HOST:-demo.rcb.me} -PORT=${PORT:-9292} +# Supported formats: qcow (kvm), vmdk (vmserver), vdi (vbox), vhd (vpc) +# Requires sudo to root usage() { - echo "$0 - Upload Ubuntu images" + echo "$0 - Upload images to OpenStack" echo "" echo "$0 [-h host] [-p port] release format" exit 1 } +HOST=${HOST:-localhost} +PORT=${PORT:-9292} + while getopts h:p: c; do case $c in - h) HOST=$OPTARG - ;; - p) PORT=$OPTARG - ;; + h) HOST=$OPTARG + ;; + p) PORT=$OPTARG + ;; esac done shift `expr $OPTIND - 1` @@ -32,50 +26,61 @@ shift `expr $OPTIND - 1` RELEASE=$1 FORMAT=$2 -case $RELEASE in - natty) ;; - maverick) ;; - lucid) ;; - karmic) ;; - jaunty) ;; - *) echo "Unknown release: $RELEASE" - usage +case $FORMAT in + kvm|qcow2) FORMAT=qcow2 + TARGET=kvm + ;; + vmserver|vmdk) + FORMAT=vmdk + TARGET=vmserver + ;; + vbox|vdi) TARGET=kvm + FORMAT=vdi + ;; + vhd|vpc) TARGET=kvm + FORMAT=vhd + ;; + *) echo "Unknown format: $FORMAT" + usage esac -case $FORMAT in - kvm|qcow2) FORMAT=qcow2 - TARGET=kvm - ;; - vmserver|vmdk) FORMAT=vmdk - TARGET=vmserver - ;; - vbox|vdi) TARGET=kvm - FORMAT=vdi - ;; - vhd|vpc) TARGET=kvm - FORMAT=vpc - ;; - *) echo "Unknown format: $FORMAT" - usage +case $RELEASE in + natty) ;; + maverick) ;; + lucid) ;; + karmic) ;; + jaunty) ;; + *) if [ ! -r $RELEASE.$FORMAT ]; then + echo "Unknown release: $RELEASE" + usage + fi + ;; esac GLANCE=`which glance` if [ -z "$GLANCE" ]; then - echo "Glance not found, must install client" - sudo apt-get install python-pip python-eventlet python-routes python-greenlet python-argparse python-sqlalchemy python-wsgiref python-pastedeploy python-xattr - sudo pip install kombu - git clone https://github.com/cloudbuilders/glance.git - cd glance - sudo python setup.py develop - cd .. - GLANCE=`which glance` + if [ -x "/opt/glance/bin/glance" ]; then + # Look for stack.sh's install + GLANCE="/opt/glance/bin/glance" + else + echo "Glance not found, must install client" + OWD=`pwd` + cd /opt + sudo apt-get install python-pip python-eventlet python-routes python-greenlet python-argparse python-sqlalchemy python-wsgiref python-pastedeploy python-xattr + sudo pip install kombu + sudo git clone https://github.com/cloudbuilders/glance.git + cd glance + sudo python setup.py develop + cd $OWD + GLANCE=`which glance` + fi fi # Create image if it doesn't exist if [ ! -r $RELEASE.$FORMAT ]; then - DIR=`dirname $0` - echo "$RELEASE.$FORMAT not found, creating...must be root to do this:" - $DIR/make_image.sh $RELEASE $FORMAT + DIR=`dirname $0` + echo "$RELEASE.$FORMAT not found, creating...must be root to do this:" + $DIR/make_image.sh $RELEASE $FORMAT fi # Upload the image