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

diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml
index e42d2fae..e38fe675 100644
--- a/puppet/services/manila-share.yaml
+++ b/puppet/services/manila-share.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   Manila-share service configured with Puppet
@@ -21,6 +21,10 @@ parameters:
   MonitoringSubscriptionManilaShare:
     default: 'overcloud-manila-share'
     type: string
+  ManilaPassword:
+    description: The password for the manila service account.
+    type: string
+    hidden: true
 
 resources:
   ManilaBase:
@@ -40,5 +44,11 @@ outputs:
         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