X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fneutron-server.yaml;h=fc04e5eebe9f7304c7c9c9bebecf079348b817c8;hb=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;hp=198d6e7f61f2e4508c1891d30bc5d6a7bd81b541;hpb=8d0497d819a0f7e75eaae8531218ca7890d8ed7b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/neutron-server.yaml b/puppet/services/pacemaker/neutron-server.yaml
index 198d6e7f..fc04e5ee 100644
--- a/puppet/services/pacemaker/neutron-server.yaml
+++ b/puppet/services/pacemaker/neutron-server.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron Server 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
@@ -19,12 +28,15 @@ resources:
   NeutronServerBase:
     type: ../neutron-server.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Neutron Server.
     value:
+      service_name: neutron_server
       config_settings:
         map_merge:
           - get_attr: [NeutronServerBase, role_data, config_settings]