Setting networking-odl v2 as a mechanism driver

The current environment files for OpenDaylight use
the opendaylight mechanism driver - changing it to
opendaylight_v2.
Also using the l3_odl_v2 as a service plugin

Depends-On: I2a1c5097614e47cc09e43bbc77305a0548d54baa
Change-Id: Iba6f52663ce4a5e4c070f58f079465fdd24ecc7c

diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml
index 00be304..6d5c740 100644 (file)
--- a/environments/neutron-opendaylight-l3.yaml
+++ b/environments/neutron-opendaylight-l3.yaml
@@ -9,6 +9,6 @@ resource_registry:
 
 parameter_defaults:
   NeutronEnableForceMetadata: true
-  NeutronMechanismDrivers: 'opendaylight'
-  NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
+  NeutronMechanismDrivers: 'opendaylight_v2'
+  NeutronServicePlugins: 'odl-router_v2'
   OpenDaylightEnableL3: "'yes'"

diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml
index 35c90aa..dd4add2 100644 (file)
--- a/environments/neutron-opendaylight.yaml
+++ b/environments/neutron-opendaylight.yaml
@@ -8,4 +8,4 @@ resource_registry:
 
 parameter_defaults:
   NeutronEnableForceMetadata: true
-  NeutronMechanismDrivers: 'opendaylight'
+  NeutronMechanismDrivers: 'opendaylight_v2'