X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fmanila-share.yaml;h=49c69fc14091d21ca043644371f0037d06d6aa22;hb=370d392dc58a124ffe09800476d1099bf6268cb3;hp=184f36941508234a1863b96e27697a3e98158afc;hpb=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml
index 184f3694..49c69fc1 100644
--- a/puppet/services/manila-share.yaml
+++ b/puppet/services/manila-share.yaml
@@ -18,6 +18,13 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionManilaShare:
+    default: 'overcloud-manila-share'
+    type: string
+  ManilaPassword:
+    description: The password for the manila service account.
+    type: string
+    hidden: true
 
 resources:
   ManilaBase:
@@ -32,9 +39,16 @@ 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]
           - manila::volume::cinder::cinder_admin_tenant_name: 'service'
+            manila::keystone::authtoken::password: {get_param: ManilaPassword}
+            manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+            manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
+            manila::keystone::authtoken::project_name: 'service'
+      service_config_settings:
+        get_attr: [ManilaBase, role_data, service_config_settings]
       step_config: |
         include ::tripleo::profile::base::manila::share