openstack/devstack
Code Issues Proposed changes

exercises/aggregates.sh: Only source openrc once

Browse Source 
Only source openrc once, and remove the unnecessary re-sourcing of
"functions" which is done by openrc.

Change-Id: I61c87a0742de274d47753a0b216c56d96344d161
This commit is contained in:
Ian Wienand 2015-08-07 12:36:00 +10:00
parent 2da606da2e
commit c0057ed515
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exercises/aggregates.sh
View File

@ -31,18 +31,13 @@ set -o xtrace
EXERCISE_DIR=$(cd $(dirname "$0") && pwd) EXERCISE_DIR=$(cd $(dirname "$0") && pwd)
TOP_DIR=$(cd $EXERCISE_DIR/..; pwd) TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
# Import common functions # Test as the admin user
source $TOP_DIR/functions # note this imports stackrc/functions, etc
. $TOP_DIR/openrc admin admin
# Import configuration
source $TOP_DIR/openrc
# Import exercise configuration # Import exercise configuration
source $TOP_DIR/exerciserc source $TOP_DIR/exerciserc
# Test as the admin user
. $TOP_DIR/openrc admin admin
# If nova api is not enabled we exit with exitcode 55 so that # If nova api is not enabled we exit with exitcode 55 so that
# the exercise is skipped # the exercise is skipped
is_service_enabled n-api || exit 55 is_service_enabled n-api || exit 55