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

Merge pull request #8 from dtroyer/master

Browse source 
More updates to image scripts
This commit is contained in:
Dean Troyer 2011-09-20 08:43:39 -07:00
commit 3400bf8bc9
3 changed files with 115 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -18,7 +18,7 @@ Tool to quickly deploy openstack dev environments
* move back to using sudo * move back to using sudo
* move nova to mysql * move nova to mysql
* munin * munin
* extract image upload to a seperate script that supports generating images via debootstrap (ubuntu-vm-builder?) * image upload with a script that supports generating images via debootstrap (ubuntu-vm-builder)
# Future # Future

99
make_image.sh
View file

@ -3,7 +3,7 @@
# #
# make_image.sh release format # make_image.sh release format
# #
# Supported formats: qcow (kvm), vmdk (vmserver), vdi (vbox), vhd (vpc) # Supported formats: qcow (kvm), vmdk (vmserver), vdi (vbox), vhd (vpc), raw
# #
# Requires sudo to root # Requires sudo to root
@ -19,14 +19,14 @@ usage() {
while getopts hm:r:s: c; do while getopts hm:r:s: c; do
case $c in case $c in
h) usage h) usage
;; ;;
m) MIRROR=$OPTARG m) MIRROR=$OPTARG
;; ;;
r) ROOTSIZE=$OPTARG r) ROOTSIZE=$OPTARG
;; ;;
s) SWAPSIZE=$OPTARG s) SWAPSIZE=$OPTARG
;; ;;
esac esac
done done
shift `expr $OPTIND - 1` shift `expr $OPTIND - 1`
@ -34,55 +34,70 @@ shift `expr $OPTIND - 1`
RELEASE=$1 RELEASE=$1
FORMAT=$2 FORMAT=$2
case $RELEASE in case $FORMAT in
natty) ;; kvm|qcow2) FORMAT=qcow2
maverick) ;; QFORMAT=qcow2
lucid) ;; HYPER=kvm
karmic) ;; ;;
jaunty) ;; vmserver|vmdk)
*) echo "Unknown release: $RELEASE" FORMAT=vmdk
usage QFORMAT=vmdk
HYPER=vmserver
;;
vbox|vdi) FORMAT=vdi
QFORMAT=vdi
HYPER=kvm
;;
vhd|vpc) FORMAT=vhd
QFORMAT=vpc
HYPER=kvm
;;
xen) FORMAT=raw
QFORMAT=raw
HYPER=xen
;;
raw) FORMAT=raw
QFORMAT=raw
HYPER=kvm
;;
*) echo "Unknown format: $FORMAT"
usage
esac esac
case $FORMAT in case $RELEASE in
kvm|qcow2) FORMAT=qcow2 natty) ;;
TARGET=kvm maverick) ;;
;; lucid) ;;
vmserver|vmdk) FORMAT=vmdk karmic) ;;
TARGET=vmserver jaunty) ;;
;; *) echo "Unknown release: $RELEASE"
vbox|vdi) FORMAT=qcow2 usage
TARGET=kvm ;;
FINAL_FORMAT=vdi
;;
vhd|vpc) FORMAT=qcow2
TARGET=kvm
FINAL_FORMAT=vpc
;;
*) echo "Unknown format: $FORMAT"
usage
esac esac
# Install stuff if necessary # Install stuff if necessary
if [ -z `which vmbuilder` ]; then if [ -z `which vmbuilder` ]; then
sudo apt-get install ubuntu-vm-builder sudo apt-get install ubuntu-vm-builder
fi fi
# Build the image # Build the image
sudo vmbuilder $TARGET ubuntu --suite $RELEASE \ TMPDISK=`mktemp imgXXXXXXXX`
SIZE=$[$ROOTSIZE+$SWAPSIZE+1]
dd if=/dev/null of=$TMPDISK bs=1M seek=$SIZE
sudo vmbuilder $HYPER ubuntu --suite $RELEASE \
-o \ -o \
--rootsize=$ROOTSIZE \ --rootsize=$ROOTSIZE \
--swapsize=$SWAPSIZE \ --swapsize=$SWAPSIZE \
--tmpfs - \ --tmpfs - \
--addpkg=openssh-server \ --addpkg=openssh-server \
--raw=$TMPDISK \
# --mirror=$MIRROR \ if [ "$FORMAT" = "raw" ]; then
if [ -z "$FINAL_FORMAT" ]; then
# Get image # Get image
mv ubuntu-$TARGET/tmp*.$FORMAT $RELEASE.$FORMAT mv $TMPDISK $RELEASE.$FORMAT
else else
# Convert image # Convert image
qemu-img convert -O $FINAL_FORMAT ubuntu-$TARGET/tmp*.$FORMAT $RELEASE.$FINAL_FORMAT qemu-img convert -O $QFORMAT $TMPDISK $RELEASE.$FORMAT
rm $TMPDISK
fi fi
rm -rf ubuntu-$TARGET rm -rf ubuntu-$HYPER

107
upload_image.sh
View file

@ -1,30 +1,24 @@
#!/bin/bash #!/bin/bash
# upload_image.sh - Upload Ubuntu images (create if necessary) in various formats # upload_image.sh - Upload Ubuntu images (create if necessary) in various formats
# # Supported formats: qcow (kvm), vmdk (vmserver), vdi (vbox), vhd (vpc)
# upload_image.sh release format # Requires sudo to root
#
# format target
# qcow2 kvm,qemu
# vmdk vmw6
# vbox vdi
# vhd vpc
HOST=${HOST:-demo.rcb.me}
PORT=${PORT:-9292}
usage() { usage() {
echo "$0 - Upload Ubuntu images" echo "$0 - Upload images to OpenStack"
echo "" echo ""
echo "$0 [-h host] [-p port] release format" echo "$0 [-h host] [-p port] release format"
exit 1 exit 1
} }
HOST=${HOST:-localhost}
PORT=${PORT:-9292}
while getopts h:p: c; do while getopts h:p: c; do
case $c in case $c in
h) HOST=$OPTARG h) HOST=$OPTARG
;; ;;
p) PORT=$OPTARG p) PORT=$OPTARG
;; ;;
esac esac
done done
shift `expr $OPTIND - 1` shift `expr $OPTIND - 1`
@ -32,51 +26,64 @@ shift `expr $OPTIND - 1`
RELEASE=$1 RELEASE=$1
FORMAT=$2 FORMAT=$2
case $RELEASE in case $FORMAT in
natty) ;; kvm|qcow2) FORMAT=qcow2
maverick) ;; TARGET=kvm
lucid) ;; ;;
karmic) ;; vmserver|vmdk)
jaunty) ;; FORMAT=vmdk
*) echo "Unknown release: $RELEASE" TARGET=vmserver
usage ;;
vbox|vdi) TARGET=kvm
FORMAT=vdi
;;
vhd|vpc) TARGET=kvm
FORMAT=vhd
;;
*) echo "Unknown format: $FORMAT"
usage
esac esac
case $FORMAT in case $RELEASE in
kvm|qcow2) FORMAT=qcow2 natty) ;;
TARGET=kvm maverick) ;;
;; lucid) ;;
vmserver|vmdk) FORMAT=vmdk karmic) ;;
TARGET=vmserver jaunty) ;;
;; *) if [ ! -r $RELEASE.$FORMAT ]; then
vbox|vdi) TARGET=kvm echo "Unknown release: $RELEASE"
FORMAT=vdi usage
;; fi
vhd|vpc) TARGET=kvm ;;
FORMAT=vpc
;;
*) echo "Unknown format: $FORMAT"
usage
esac esac
GLANCE=`which glance` GLANCE=`which glance`
if [ -z "$GLANCE" ]; then if [ -z "$GLANCE" ]; then
echo "Glance not found, must install client" if [ -x "/opt/glance/bin/glance" ]; then
sudo apt-get install python-pip python-eventlet python-routes python-greenlet python-argparse python-sqlalchemy python-wsgiref python-pastedeploy python-xattr # Look for stack.sh's install
sudo pip install kombu GLANCE="/opt/glance/bin/glance"
git clone https://github.com/cloudbuilders/glance.git else
cd glance # Install Glance client in /opt
sudo python setup.py develop echo "Glance not found, must install client"
cd .. OWD=`pwd`
GLANCE=`which glance` 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 fi
# Create image if it doesn't exist # Create image if it doesn't exist
if [ ! -r $RELEASE.$FORMAT ]; then if [ ! -r $RELEASE.$FORMAT ]; then
DIR=`dirname $0` DIR=`dirname $0`
echo "$RELEASE.$FORMAT not found, creating...must be root to do this:" echo "$RELEASE.$FORMAT not found, creating..."
$DIR/make_image.sh $RELEASE $FORMAT $DIR/make_image.sh $RELEASE $FORMAT
fi fi
# Upload the image # Upload the image
echo "Uploading image $RELEASE.$FORMAT to $HOST"
$GLANCE add name=$RELEASE.$FORMAT is_public=true disk_format=$FORMAT --host $HOST --port $PORT <$RELEASE.$FORMAT $GLANCE add name=$RELEASE.$FORMAT is_public=true disk_format=$FORMAT --host $HOST --port $PORT <$RELEASE.$FORMAT