From c82a1ae68c06c67dbc11b1a98f0bc46b89f782dc Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 10 Mar 2017 12:30:14 -0500 Subject: manila: switch auth_uri to use uri_no_suffix Switch Manila to use auth_uri with keystone versionless endpoint. Change-Id: If05032a5c7d93b5787d3f18c0aa374bac3cbd478 Partial-implement: blueprint keystone-v3 --- puppet/services/manila-api.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'puppet') diff --git a/puppet/services/manila-api.yaml b/puppet/services/manila-api.yaml index 7b78c82e..4061ca28 100644 --- a/puppet/services/manila-api.yaml +++ b/puppet/services/manila-api.yaml @@ -48,9 +48,11 @@ outputs: map_merge: - get_attr: [ManilaBase, role_data, config_settings] - manila::keystone::authtoken::password: {get_param: ManilaPassword} - manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + manila::keystone::authtoken::auth_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } manila::keystone::authtoken::project_name: 'service' + manila::keystone::authtoken::user_domain_name: 'Default' + manila::keystone::authtoken::project_domain_name: 'Default' tripleo.manila_api.firewall_rules: '150 manila': dport: -- cgit 1.2.3-korg