X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fneutron-server.yaml;h=33bc2d990dd26055b1b11bb63b3a514b983edda2;hb=e3edcb266be520391c9e044f9dcc37dbcf80b8fd;hp=74234a854d8f53a246fb5ede115a1080b2b385ba;hpb=094c9d0bf6f697c32ad6c984161c53a6c4b38614;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/neutron-server.yaml b/puppet/services/pacemaker/neutron-server.yaml
index 74234a85..33bc2d99 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,13 +28,16 @@ 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
+      service_name: neutron_server
+      monitoring_subscription: {get_attr: [NeutronServerBase, role_data, monitoring_subscription]}
       config_settings:
         map_merge:
           - get_attr: [NeutronServerBase, role_data, config_settings]