X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fneutron-plugin-ml2.yaml;h=aa62bdedf9bcb2d646a4c2a5e324e4215f3f59aa;hb=c76feac1a9d80c545330085c9928b6ff15f58096;hp=34864d3ad5a20cd57b9ecd030455f0c5a5fce2e4;hpb=f9e5887deeeec5b8a0107e4305fc7f09ef855069;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index 34864d3a..aa62bded 100644
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Neutron ML2 Plugin configured with Puppet
@@ -20,21 +20,31 @@ parameters:
     default: 'tripleoupstream'
     type: string
   DockerNeutronConfigImage:
-    description: image
-    default: 'centos-binary-neutron-openvswitch-agent:latest'
+    description: The container image to use for the neutron config_volume
+    default: 'centos-binary-neutron-server:latest'
     type: string
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
 
 resources:
 
   NeutronBase:
-    type: ../../puppet/services/neutron-plugin-ml2.yaml
+    type: OS::TripleO::Docker::NeutronMl2PluginBase
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
@@ -50,7 +60,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: 'neutron'
-        puppet_tags: ''
+        puppet_tags: neutron_plugin_ml2
         step_config: *step_config
         config_image:
           list_join: