X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fmanila-share.yaml;h=e42d2fae3dd1ca9b5687804b1ee190929c9a4bab;hb=d601d64e110f5dfd3e471adc82ad8f898158c175;hp=20f36aa32845f65ae5332fef37776547d9cef05b;hpb=dfcfb9d4de5ecc4b624ea4497718cb98e80b2d7e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml
index 20f36aa3..e42d2fae 100644
--- a/puppet/services/manila-share.yaml
+++ b/puppet/services/manila-share.yaml
@@ -4,16 +4,30 @@ description: >
   Manila-share service 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
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionManilaShare:
+    default: 'overcloud-manila-share'
+    type: string
 
 resources:
   ManilaBase:
     type: ./manila-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -21,6 +35,7 @@ outputs:
     description: Role data for the Manila-share role.
     value:
       service_name: manila_share
+      monitoring_subscription: {get_param: MonitoringSubscriptionManilaShare}
       config_settings:
         map_merge:
           - get_attr: [ManilaBase, role_data, config_settings]