openstack/devstack
Code Issues Proposed changes

Fixed unconditioned source phase in OpenDaylight extras

Browse Source 
Should source ``lib/opendaylight`` in ``extras.d/80-opendaylight.sh``
only when appropriate services are enabled.
Fix for bug/1290033

Change-Id: Ifa470e1e132029f3c5bf255f27c4e96373b339a8
Signed-off-by: Roey Chen <roeyc@mellanox.com>
This commit is contained in:
Roey Chen 2014-03-10 11:25:50 +02:00
parent 0dfbf9b4b9
commit 11b36c9b0a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extras.d/80-opendaylight.sh
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