Merge "Don't recalculate EndpointMap to get outputs"

[apex-tripleo-heat-templates.git] / puppet / services / manila-share.yaml

diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml
index 49c69fc..6ac0d2c 100644 (file)
--- 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
@@ -46,7 +46,7 @@ outputs:
           - 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::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             manila::keystone::authtoken::project_name: 'service'
       service_config_settings:
         get_attr: [ManilaBase, role_data, service_config_settings]