summaryrefslogtreecommitdiffstats
path: root/networking-odl/devstack/plugin.sh
diff options
context:
space:
mode:
Diffstat (limited to 'networking-odl/devstack/plugin.sh')
-rw-r--r--networking-odl/devstack/plugin.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/networking-odl/devstack/plugin.sh b/networking-odl/devstack/plugin.sh
index a65840d..1f76b0f 100644
--- a/networking-odl/devstack/plugin.sh
+++ b/networking-odl/devstack/plugin.sh
@@ -24,7 +24,6 @@ source $TOP_DIR/lib/neutron_plugins/ovs_base
# Import ODL settings
source $NETWORKING_ODL_DIR/devstack/settings.odl
source $NETWORKING_ODL_DIR/devstack/odl-releases/$ODL_RELEASE
-source $NETWORKING_ODL_DIR/devstack/odl-releases/common
# Utilities functions for setting up Java
source $NETWORKING_ODL_DIR/devstack/setup_java.sh
@@ -78,10 +77,7 @@ if is_service_enabled odl-compute; then
fi
bind_opendaylight_controller
wait_for_active_bridge $OVS_BR $ODL_RETRY_SLEEP_INTERVAL $ODL_BOOT_WAIT
-
- # L3 needs to be configured only for netvirt-ovsdb - in netvirt-vpnservice L3 is configured
- # by provider_mappings, and the provider mappings are added to br-int by default
- if [[ ",$ODL_NETVIRT_KARAF_FEATURE," =~ ",$ODL_NETVIRT_KARAF_FEATURE_OVSDB," ]] && [ "${ODL_L3}" == "True" ]; then
+ if [ "${ODL_L3}" == "True" ]; then
configure_opendaylight_l3
fi
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then