X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fneutron-plugin-ml2.yaml;h=234f116ea4f199b7536d6829055941fb6d792ce2;hb=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;hp=ac9d240274fd2d7cfa825f2262fca4c8c0a63373;hpb=71ede867ae281413d1ddd24d07867f34d32a76fa;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/neutron-plugin-ml2.yaml b/puppet/services/pacemaker/neutron-plugin-ml2.yaml
index ac9d2402..234f116e 100644
--- a/puppet/services/pacemaker/neutron-plugin-ml2.yaml
+++ b/puppet/services/pacemaker/neutron-plugin-ml2.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron ML2 Plugin with Pacemaker 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
@@ -14,15 +23,20 @@ resources:
 
   NeutronMl2Base:
     type: ../neutron-plugin-ml2.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: [NeutronMl2Base, role_data, config_settings]
           - neutron::agents::ml2::ovs::enabled: false
             neutron::agents::ml2::ovs::manage_service: false
       step_config: |
-        include ::tripleo::profile::pacemaker::neutron::ml2
+        include ::tripleo::profile::pacemaker::neutron::plugins::ml2