openstack/devstack
Code Issues Proposed changes

Merge "exercises/aggregates.sh: Only source openrc once"

Browse Source
This commit is contained in:
Jenkins
2015-08-28 01:45:10 +00:00
committed by Gerrit Code Review
parent 15e8525003 c0057ed515
commit 6059752fc0
1 changed files with 3 additions and 8 deletions
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)
TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
# Import common functions
source $TOP_DIR/functions
# Import configuration
source $TOP_DIR/openrc
# Test as the admin user
# note this imports stackrc/functions, etc
. $TOP_DIR/openrc admin admin
# Import exercise configuration
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
# the exercise is skipped
is_service_enabled n-api || exit 55