From 495964748e8fe591db096ace0f30dbe450898cc9 Mon Sep 17 00:00:00 2001 From: tomsou Date: Fri, 1 Dec 2017 14:27:07 +0200 Subject: Update OpenDaylight BGPVPN driver JIRA: APEX-555 Change-Id: Ib94b0182fd5fbc3a254cae5862a82982bf3131be Signed-off-by: tomsou --- environments/neutron-bgpvpn-opendaylight.yaml | 8 +++++--- environments/neutron-bgpvpn.yaml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/environments/neutron-bgpvpn-opendaylight.yaml b/environments/neutron-bgpvpn-opendaylight.yaml index 1d2e0774..4af546ee 100644 --- a/environments/neutron-bgpvpn-opendaylight.yaml +++ b/environments/neutron-bgpvpn-opendaylight.yaml @@ -3,10 +3,12 @@ # This environment file deploys Neutron BGPVPN service and configures # Opendaylight as its service provider. # -# - OpenDaylight: BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default +# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default +# - NeutronServicePlugins: odl-router_v2, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin + resource_registry: OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml parameter_defaults: - NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin' - BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default' + NeutronServicePlugins: 'odl-router_v2, bgpvpn' + BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default' diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml index 2a632480..e648f019 100644 --- a/environments/neutron-bgpvpn.yaml +++ b/environments/neutron-bgpvpn.yaml @@ -6,7 +6,7 @@ # # - Bagpipe: BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default # - OpenContrail: BGPVPN:OpenContrail:networking_bgpvpn.neutron.services.service_drivers.opencontrail.opencontrail.OpenContrailBGPVPNDriver:default -# - OpenDaylight: BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default +# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default # - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default resource_registry: OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml -- cgit 1.2.3-korg