Skip to content

Commit 0da8bdc

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Cleanup exercise scripts"
2 parents e76fb89 + ad10176 commit 0da8bdc

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

exercises/bundle.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ set -o errexit
1717
# an error. It is also useful for following allowing as the install occurs.
1818
set -o xtrace
1919

20+
2021
# Settings
2122
# ========
2223

exercises/client-args.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
#!/usr/bin/env bash
22

3+
**client-args.sh**
4+
35
# Test OpenStack client authentication aguemnts handling
46

57
echo "*********************************************************************"
68
echo "Begin DevStack Exercise: $0"
79
echo "*********************************************************************"
810

11+
912
# Settings
1013
# ========
1114

@@ -38,7 +41,7 @@ export x_USERNAME=$OS_USERNAME
3841
export x_PASSWORD=$OS_PASSWORD
3942
export x_AUTH_URL=$OS_AUTH_URL
4043

41-
#Unset the usual variables to force argument processing
44+
# Unset the usual variables to force argument processing
4245
unset OS_TENANT_NAME
4346
unset OS_USERNAME
4447
unset OS_PASSWORD

exercises/client-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env bash
22

3+
**client-env.sh**
4+
35
# Test OpenStack client enviroment variable handling
46

57
echo "*********************************************************************"
68
echo "Begin DevStack Exercise: $0"
79
echo "*********************************************************************"
810

9-
# Verify client workage
10-
VERIFY=${1:-""}
1111

1212
# Settings
1313
# ========

exercises/floating_ips.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ if ! nova secgroup-list | grep -q $SECGROUP; then
8383
fi
8484
fi
8585

86-
# determinine instance type
86+
# Determinine instance type
8787
# -------------------------
8888

8989
# List of instance types:
@@ -100,6 +100,7 @@ NAME="ex-float"
100100
VM_UUID=`nova boot --flavor $INSTANCE_TYPE --image $IMAGE $NAME --security_groups=$SECGROUP | grep ' id ' | get_field 2`
101101
die_if_not_set VM_UUID "Failure launching $NAME"
102102

103+
103104
# Testing
104105
# =======
105106

exercises/swift.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ CONTAINER=ex-swift
4040
# exercise is skipped.
4141
is_service_enabled swift || exit 55
4242

43+
4344
# Testing Swift
4445
# =============
4546

0 commit comments

Comments
 (0)