Merge "Cleanup exercise scripts"
This commit is contained in:
commit
0da8bdcf38
@ -17,6 +17,7 @@ set -o errexit
|
||||
# an error. It is also useful for following allowing as the install occurs.
|
||||
set -o xtrace
|
||||
|
||||
|
||||
# Settings
|
||||
# ========
|
||||
|
||||
|
@ -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
|
||||
# ========
|
||||
|
||||
|
@ -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
|
||||
# ========
|
||||
|
@ -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
|
||||
# =======
|
||||
|
||||
|
@ -40,6 +40,7 @@ CONTAINER=ex-swift
|
||||
# exercise is skipped.
|
||||
is_service_enabled swift || exit 55
|
||||
|
||||
|
||||
# Testing Swift
|
||||
# =============
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user