Merge "Add release note for generated sample environments"

[apex-tripleo-heat-templates.git] / docker / services / neutron-plugin-ml2.yaml

diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index 34864d3..7211014 100644 (file)
--- 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,12 +20,20 @@ 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:
 
@@ -35,6 +43,8 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data: