X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fmanila-share.yaml;h=ddc13df31d49767e3a02d8b55716b9a549f4b464;hb=ebd73c0b0950b2823ce17acae76ff87a8246675d;hp=0f88e89ce105aff94c3d9a2cf08b89eaf71d1303;hpb=e06ff3d45b2d92777ee16360ff55d5d4c10ac433;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml
index 0f88e89c..ddc13df3 100644
--- a/puppet/services/pacemaker/manila-share.yaml
+++ b/puppet/services/pacemaker/manila-share.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   The manila-share service 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,12 +23,17 @@ resources:
 
   ManilaShareBase:
     type: ../manila-share.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the manila-share pacemaker role.
     value:
       service_name: manila_share
+      monitoring_subscription: {get_attr: [ManilaShareBase, role_data, monitoring_subscription]}
       config_settings:
         map_merge:
           - get_attr: [ManilaShareBase, role_data, config_settings]