X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=environments%2Fneutron-opendaylight.yaml;h=ed7292b7877e295b107568da8d7b40c4cc3eca8e;hb=8022b520d365055b9ad9be1f57b52fed556e1d45;hp=8110eab3ce7463c833dac00720a6236cca9f21b6;hpb=ded5fe48f7cabaa82d13df324940069d69c3aabb;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml
index 8110eab3..ed7292b7 100644
--- a/environments/neutron-opendaylight.yaml
+++ b/environments/neutron-opendaylight.yaml
@@ -1,12 +1,13 @@
-# A Heat environment that can be used to deploy OpenDaylight
+# A Heat environment that can be used to deploy OpenDaylight with L3 DVR
 resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   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'
+  NeutronMechanismDrivers: 'opendaylight_v2'
+  NeutronServicePlugins: 'odl-router_v2,trunk'