Merge "Cleanup exercise scripts"

This commit is contained in:
Jenkins 2012-07-06 15:41:57 +00:00 committed by Gerrit Code Review
commit 0da8bdcf38
5 changed files with 10 additions and 4 deletions

View File

@ -17,6 +17,7 @@ set -o errexit
# an error. It is also useful for following allowing as the install occurs.
set -o xtrace
# Settings
# ========

View File

@ -1,11 +1,14 @@
#!/usr/bin/env bash
**client-args.sh**
# Test OpenStack client authentication aguemnts handling
echo "*********************************************************************"
echo "Begin DevStack Exercise: $0"
echo "*********************************************************************"
# Settings
# ========
@ -38,7 +41,7 @@ export x_USERNAME=$OS_USERNAME
export x_PASSWORD=$OS_PASSWORD
export x_AUTH_URL=$OS_AUTH_URL
#Unset the usual variables to force argument processing
# Unset the usual variables to force argument processing
unset OS_TENANT_NAME
unset OS_USERNAME
unset OS_PASSWORD

View File

@ -1,13 +1,13 @@
#!/usr/bin/env bash
**client-env.sh**
# Test OpenStack client enviroment variable handling
echo "*********************************************************************"
echo "Begin DevStack Exercise: $0"
echo "*********************************************************************"
# Verify client workage
VERIFY=${1:-""}
# Settings
# ========

View File

@ -83,7 +83,7 @@ if ! nova secgroup-list | grep -q $SECGROUP; then
fi
fi
# determinine instance type
# Determinine instance type
# -------------------------
# List of instance types:
@ -100,6 +100,7 @@ NAME="ex-float"
VM_UUID=`nova boot --flavor $INSTANCE_TYPE --image $IMAGE $NAME --security_groups=$SECGROUP | grep ' id ' | get_field 2`
die_if_not_set VM_UUID "Failure launching $NAME"
# Testing
# =======

View File

@ -40,6 +40,7 @@ CONTAINER=ex-swift
# exercise is skipped.
is_service_enabled swift || exit 55
# Testing Swift
# =============