X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-plugin-ml2.yaml;h=165b9687deb360a11af00e07097b90f32d7776e7;hb=5d13a6397c4dccc78dc13c4bf23d651485868904;hp=435a6de0210f21358b3832763e32ed257677ba0f;hpb=89fbd07afef275e0f818d3575fd0be4a1d4248cf;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml
index 435a6de0..165b9687 100644
--- a/puppet/services/neutron-plugin-ml2.yaml
+++ b/puppet/services/neutron-plugin-ml2.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron ML2 Plugin configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -56,11 +65,16 @@ resources:
 
   NeutronBase:
     type: ./neutron-base.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Neutron ML2 plugin.
     value:
+      service_name: neutron_plugin_ml2
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
@@ -106,4 +120,4 @@ outputs:
                   TYPES: {get_param: NeutronNetworkType}
 
       step_config: |
-        include ::tripleo::profile::base::neutron::ml2
+        include ::tripleo::profile::base::neutron::plugins::ml2