X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-plugin-ml2-odl.yaml;h=68bba110f0f34b3a64a26893e28ddb1c52f44922;hb=refs%2Fheads%2Fmaster;hp=88246f9c02fea2bf3fa31fef39812035c544986f;hpb=1916259308c645d659a4428e26c16a4c5a89c9e4;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-plugin-ml2-odl.yaml b/puppet/services/neutron-plugin-ml2-odl.yaml
index 88246f9c..68bba110 100644
--- a/puppet/services/neutron-plugin-ml2-odl.yaml
+++ b/puppet/services/neutron-plugin-ml2-odl.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Neutron ML2/OpenDaylight plugin configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -29,13 +33,14 @@ parameters:
   OpenDaylightPortBindingController:
     description: OpenDaylight port binding controller
     type: string
-    default: 'network-topology'
+    default: 'pseudo-agentdb-binding'
 
 resources:
 
   NeutronMl2Base:
     type: ./neutron-plugin-ml2.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}