openstack/devstack
Code Issues Proposed changes

allow multiple images

Browse Source
This commit is contained in:
Anthony Young 2011-10-14 09:31:09 -07:00
parent c84e0c4c16
commit 120f4860cd
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
stack.sh
View File

@ -668,29 +668,33 @@ screen_it dash "cd $DASH_DIR && sudo /etc/init.d/apache2 restart; sudo tail -f /
# TTY also uses cloud-init, supporting login via keypair and sending scripts as # TTY also uses cloud-init, supporting login via keypair and sending scripts as
# userdata. See https://help.ubuntu.com/community/CloudInit for more on cloud-init # userdata. See https://help.ubuntu.com/community/CloudInit for more on cloud-init
# #
# Override IMAGE_URL if you would to launch a different image. Some other options: # Override IMAGE_URLS if you would to launch a different image(s).
# Specify IMAGE_URLS as a comma-separated list of uec urls. Some other options include:
# natty: http://uec-images.ubuntu.com/natty/current/natty-server-cloudimg-amd64.tar.gz # natty: http://uec-images.ubuntu.com/natty/current/natty-server-cloudimg-amd64.tar.gz
# oneiric: http://uec-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64.tar.gz
if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
# Create a directory for the downloadedthe images tarballs. # Create a directory for the downloadedthe images tarballs.
mkdir -p $FILES/images mkdir -p $FILES/images
# Downloads the image (uec ami+aki style), then extracts it. for image_url in ${IMAGE_URLS//,/ }; do
IMAGE_FNAME=`echo "$IMAGE_URL" | python -c "import sys; print sys.stdin.read().split('/')[-1]"` # Downloads the image (uec ami+aki style), then extracts it.
IMAGE_NAME=`echo "$IMAGE_FNAME" | python -c "import sys; print sys.stdin.read().split('.tar.gz')[0].split('.tgz')[0]"` IMAGE_FNAME=`echo "$image_url" | python -c "import sys; print sys.stdin.read().split('/')[-1]"`
if [ ! -f $FILES/$IMAGE_FNAME ]; then IMAGE_NAME=`echo "$IMAGE_FNAME" | python -c "import sys; print sys.stdin.read().split('.tar.gz')[0].split('.tgz')[0]"`
wget -c $IMAGE_URL -O $FILES/$IMAGE_FNAME if [ ! -f $FILES/$IMAGE_FNAME ]; then
fi wget -c $image_url -O $FILES/$IMAGE_FNAME
fi
# Extract ami and aki files # Extract ami and aki files
tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images
# Use glance client to add the kernel the root filesystem. # Use glance client to add the kernel the root filesystem.
# We parse the results of the first upload to get the glance ID of the # We parse the results of the first upload to get the glance ID of the
# kernel for use when uploading the root filesystem. # kernel for use when uploading the root filesystem.
RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*` RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*`
KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "` KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img
done
fi fi
# Fin # Fin

4
stackrc
View File

@ -27,8 +27,8 @@ NOVACLIENT_BRANCH=master
OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git
OPENSTACKX_BRANCH=diablo OPENSTACKX_BRANCH=diablo
# Specify a uec image to download and install into glance. # Specify a comma-separated list of uec images to download and install into glance.
IMAGE_URL=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz IMAGE_URLS=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
# allow local overrides of env variables # allow local overrides of env variables
if [ -f ./localrc ]; then if [ -f ./localrc ]; then