Merge "Use provided qemu.conf in libvirt container"

[apex-tripleo-heat-templates.git] / environments / neutron-opendaylight-l3.yaml

diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml
index da915bd..6d5c740 100644 (file)
--- a/environments/neutron-opendaylight-l3.yaml
+++ b/environments/neutron-opendaylight-l3.yaml
@@ -2,13 +2,13 @@
 resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
-  OS::TripleO::Services::OpenDaylight: ../puppet/services/opendaylight-api.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml
   OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
 
 parameter_defaults:
-  EnableOpenDaylightOnController: true
   NeutronEnableForceMetadata: true
-  NeutronMechanismDrivers: 'opendaylight'
-  NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
+  NeutronMechanismDrivers: 'opendaylight_v2'
+  NeutronServicePlugins: 'odl-router_v2'
   OpenDaylightEnableL3: "'yes'"