Cleanup exercise scripts
* whitespace and comment cleanups only Change-Id: Iab9c2d9a25c3473f14190d60f2f2cf5be0ed59dc
This commit is contained in:
parent
c4cd4140d3
commit
ad101767b7
@ -17,6 +17,7 @@ set -o errexit
|
|||||||
# an error. It is also useful for following allowing as the install occurs.
|
# an error. It is also useful for following allowing as the install occurs.
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
|
|
||||||
|
|
||||||
# Settings
|
# Settings
|
||||||
# ========
|
# ========
|
||||||
|
|
||||||
|
@ -1,11 +1,14 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
**client-args.sh**
|
||||||
|
|
||||||
# Test OpenStack client authentication aguemnts handling
|
# Test OpenStack client authentication aguemnts handling
|
||||||
|
|
||||||
echo "*********************************************************************"
|
echo "*********************************************************************"
|
||||||
echo "Begin DevStack Exercise: $0"
|
echo "Begin DevStack Exercise: $0"
|
||||||
echo "*********************************************************************"
|
echo "*********************************************************************"
|
||||||
|
|
||||||
|
|
||||||
# Settings
|
# Settings
|
||||||
# ========
|
# ========
|
||||||
|
|
||||||
@ -38,7 +41,7 @@ export x_USERNAME=$OS_USERNAME
|
|||||||
export x_PASSWORD=$OS_PASSWORD
|
export x_PASSWORD=$OS_PASSWORD
|
||||||
export x_AUTH_URL=$OS_AUTH_URL
|
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_TENANT_NAME
|
||||||
unset OS_USERNAME
|
unset OS_USERNAME
|
||||||
unset OS_PASSWORD
|
unset OS_PASSWORD
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
**client-env.sh**
|
||||||
|
|
||||||
# Test OpenStack client enviroment variable handling
|
# Test OpenStack client enviroment variable handling
|
||||||
|
|
||||||
echo "*********************************************************************"
|
echo "*********************************************************************"
|
||||||
echo "Begin DevStack Exercise: $0"
|
echo "Begin DevStack Exercise: $0"
|
||||||
echo "*********************************************************************"
|
echo "*********************************************************************"
|
||||||
|
|
||||||
# Verify client workage
|
|
||||||
VERIFY=${1:-""}
|
|
||||||
|
|
||||||
# Settings
|
# Settings
|
||||||
# ========
|
# ========
|
||||||
|
@ -83,7 +83,7 @@ if ! nova secgroup-list | grep -q $SECGROUP; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# determinine instance type
|
# Determinine instance type
|
||||||
# -------------------------
|
# -------------------------
|
||||||
|
|
||||||
# List of instance types:
|
# 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`
|
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"
|
die_if_not_set VM_UUID "Failure launching $NAME"
|
||||||
|
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
# =======
|
# =======
|
||||||
|
|
||||||
|
@ -40,6 +40,7 @@ CONTAINER=ex-swift
|
|||||||
# exercise is skipped.
|
# exercise is skipped.
|
||||||
is_service_enabled swift || exit 55
|
is_service_enabled swift || exit 55
|
||||||
|
|
||||||
|
|
||||||
# Testing Swift
|
# Testing Swift
|
||||||
# =============
|
# =============
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user