openstack/devstack
Code Issues Proposed changes

Merge "Modify euca test to get zone using describe"

Browse Source
This commit is contained in:
Jenkins 2012-09-24 21:34:24 +00:00 committed by Gerrit Code Review
commit 6dd06ae7e6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
exercises/euca.sh
View File

@ -24,7 +24,6 @@ set -o xtrace
# Keep track of the current directory
EXERCISE_DIR=$(cd $(dirname "$0") && pwd)
TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
VOLUME_ZONE=nova
VOLUME_SIZE=1
ATTACH_DEVICE=/dev/vdc
@ -75,11 +74,15 @@ fi
# Volumes
# -------
if [[ "$ENABLED_SERVICES" =~ "n-vol" || "$ENABLED_SERVICES" =~ "c-vol" ]]; then
VOLUME_ZONE=`euca-describe-availability-zones | head -n1 | cut -f2`
die_if_not_set VOLUME_ZONE "Failure to find zone for volume"
VOLUME=`euca-create-volume -s 1 -z $VOLUME_ZONE | cut -f2`
die_if_not_set VOLUME "Failure to create volume"
# Test that volume has been created
VOLUME=`euca-describe-volumes | cut -f2`
die_if_not_set VOLUME "Failure to get volume"
# Test volume has become available
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then