X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fneutron-midonet.yaml;h=fb39ea4449471cf7318c8eac84e75302d12b8c73;hb=43476e235ce11359a5327f9dfca671b8ffeb5ab9;hp=3c185da9fad47f52a0254b2ea36b25727c9c7e7f;hpb=6b30ff11d4e2eafda7a3ab693055c687d4a8da5d;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/neutron-midonet.yaml b/puppet/services/pacemaker/neutron-midonet.yaml
index 3c185da9..fb39ea44 100644
--- a/puppet/services/pacemaker/neutron-midonet.yaml
+++ b/puppet/services/pacemaker/neutron-midonet.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron Midonet 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
@@ -15,13 +24,15 @@ resources:
   NeutronMidonetBase:
     type: ../neutron-midonet.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Neutron Midonet plugin.
     value:
-      service_name: neutron-midonet
+      service_name: neutron_midonet
       config_settings:
         map_merge:
           - get_attr: [NeutronMidonetBase, role_data, config_settings]