Browse code
Fixed unconditioned source phase in OpenDaylight extras
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>
Roey Chen authored on 2014/03/10 18:25:50Showing 1 changed files
| ... | ... |
@@ -1,7 +1,9 @@ |
| 1 | 1 |
# opendaylight.sh - DevStack extras script |
| 2 | 2 |
|
| 3 |
-# Need this first to get the is_***_enabled for ODL |
|
| 4 |
-source $TOP_DIR/lib/opendaylight |
|
| 3 |
+if is_service_enabled odl-server odl-compute; then |
|
| 4 |
+ # Initial source |
|
| 5 |
+ [[ "$1" == "source" ]] && source $TOP_DIR/lib/opendaylight |
|
| 6 |
+fi |
|
| 5 | 7 |
|
| 6 | 8 |
if is_service_enabled odl-server; then |
| 7 | 9 |
if [[ "$1" == "source" ]]; then |