Merge "Changing to L2GW Opendaylight v2 driver"

This commit is contained in:
Zuul 2018-04-02 13:38:46 +00:00 committed by Gerrit Code Review
commit 74402a447a
4 changed files with 8 additions and 5 deletions

View File

@ -3,13 +3,13 @@
# Currently there are only two service provider for Neutron L2 Gateway
# This file enables L2GW service with OpenDaylight as driver.
#
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
resource_registry:
OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml
parameter_defaults:
NeutronServicePlugins: "odl-router_v2,trunk,l2gw"
L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default']
L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default']
# Optional
# L2gwServiceDefaultInterfaceName: "FortyGigE1/0/1"

View File

@ -5,7 +5,7 @@
# In order to enable other backend, replace the content of L2gwServiceProvider
#
# - L2 gateway agent: L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
resource_registry:
OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml
OS::TripleO::Services::NeutronL2gwAgent: ../puppet/services/neutron-l2gw-agent.yaml

View File

@ -3,13 +3,13 @@
# Currently there are only two service provider for Neutron L2 Gateway
# This file enables L2GW service with OpenDaylight as driver.
#
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
resource_registry:
OS::TripleO::Services::NeutronL2gwApi: ../../docker/services/neutron-l2gw-api.yaml
parameter_defaults:
NeutronServicePlugins: "odl-router_v2,trunk,l2gw"
L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default']
L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default']
# Optional
# L2gwServiceDefaultInterfaceName: "FortyGigE1/0/1"

View File

@ -0,0 +1,3 @@
---
features:
- L2GW driver changes to version 2 when using OpenDaylight.