diff options
| author |   Wojciech Dec <wdec@cisco.com> | 2016-08-17 13:14:23 +0200 |
|---|---|---|
| committer | Wojciech Dec <wdec@cisco.com> | 2016-08-17 13:14:23 +0200 |
| commit | 4979a23b8b2c0094ced98cf05eebb692d6609937 (patch) | |
| tree | c49ceeb5b127fdb0e10c0f5ac0516be96cbd31a9 /networking-odl/devstack/override-defaults | |
| parent | c3b2c2a9a22bac5cf17813c589444d3abebaa23b (diff) | |
Correcting networking-odl to mitaka/stable + app topology patch
Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>
Diffstat (limited to 'networking-odl/devstack/override-defaults')
| -rw-r--r-- | networking-odl/devstack/override-defaults | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/networking-odl/devstack/override-defaults b/networking-odl/devstack/override-defaults index 399a528..82ec60e 100644 --- a/networking-odl/devstack/override-defaults +++ b/networking-odl/devstack/override-defaults @@ -3,14 +3,7 @@ # We will enable the opendaylight ML2 MechanismDriver v1 version by default. # Note we are also enabling the logger driver, which is helpful for # debugging things on the Neutron side. -if [[ "$ODL_V2DRIVER" == "True" ]] -then - V2_POSTFIX="_v2" -else - V2_POSTFIX="" -fi - -Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-"opendaylight${V2_POSTFIX},logger"} +Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-"opendaylight,logger"} # This triggers the provisioning of L3 resources like routers and # external network, if not overriden. @@ -23,11 +16,10 @@ disable_service q-agt # If ODL_L3 is enabled, then we don't need the L3 agent and OpenDaylight # is going to act as the ML2's L3 service plugin. -# NETVIRT_VPNSERVICE feature enables ODL L3 by default, so ODL_L3 is disregarded. -if [[ ",$ODL_NETVIRT_KARAF_FEATURE," =~ ",$ODL_NETVIRT_KARAF_FEATURE_VPNSERVICE," ]] || [ "$ODL_L3" == "True" ]; +if [[ "$ODL_L3" == "True" ]] then disable_service q-l3 - ML2_L3_PLUGIN="${ML2_L3_PLUGIN:-odl-router${V2_POSTFIX}}" + ML2_L3_PLUGIN="${ML2_L3_PLUGIN:-odl-router}" fi # [networking-feature-enabled] api-extensions |