Merge "Fixed unconditioned source phase in OpenDaylight extras"

This commit is contained in:
Jenkins 2014-03-10 15:46:09 +00:00 committed by Gerrit Code Review
commit 9162f9b8ae

View File

@ -1,7 +1,9 @@
# opendaylight.sh - DevStack extras script
# Need this first to get the is_***_enabled for ODL
source $TOP_DIR/lib/opendaylight
if is_service_enabled odl-server odl-compute; then
# Initial source
[[ "$1" == "source" ]] && source $TOP_DIR/lib/opendaylight
fi
if is_service_enabled odl-server; then
if [[ "$1" == "source" ]]; then