openstack
/
grenade
Code Issues Proposed changes

Merge "Fix javelin image name setup"

This commit is contained in:
Jenkins 2013-03-22 19:44:51 +00:00 committed by Gerrit Code Review
parent e10738591c a2f959e36d
commit cdf7fe90b4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack.localrc.target
View File

@ -33,5 +33,5 @@ SWIFT_HASH=8213897fads879789asdf789
SWIFT_REPLICAS=1
# DevStack upgraded the cirros image between folsom and grizzly, use the old one here
DEFAULT_IMAGE_NAME=cirros-0.3.0-x86_64-uec
IMAGE_URLS=http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz
#DEFAULT_IMAGE_NAME=cirros-0.3.0-x86_64-uec
#IMAGE_URLS=http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz

13
setup-javelin
View File

@ -68,13 +68,12 @@ export OS_PASSWORD=$JPASSWORD
# It's really cirros with our own name
# Assumes DevStack.$START has already set this up
BASE_NAME=0.3.0-x86_64
CIRROS_IMAGE=cirros-${BASE_NAME}
CIRROS_DIR=$BASE_DEVSTACK_DIR/files/images/$CIRROS_IMAGE-uec
KERNEL=$CIRROS_DIR/$CIRROS_IMAGE-vmlinuz
RAMDISK=$CIRROS_DIR/$CIRROS_IMAGE-initrd
ROOTDISK=$CIRROS_DIR/$CIRROS_IMAGE-blank.img
JAVELIN_IMAGE=javelin-${BASE_NAME}-uec
CIRROS_IMAGE=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-uec}
CIRROS_DIR=$BASE_DEVSTACK_DIR/files/images/$CIRROS_IMAGE
KERNEL=$CIRROS_DIR/${CIRROS_IMAGE/uec/}vmlinuz
RAMDISK=$CIRROS_DIR/${CIRROS_IMAGE/uec/}initrd
ROOTDISK=$CIRROS_DIR/${CIRROS_IMAGE/uec/}blank.img
JAVELIN_IMAGE=${CIRROS_IMAGE/cirros/javelin}
# Old glance client cuts off name field, use nova image-list for now
IMAGE=$(nova image-list | awk "/ $JAVELIN_IMAGE.img / { print \$2 }")