diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2017-03-10 12:30:14 -0500 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2017-03-13 08:06:21 -0400 |
| commit | c82a1ae68c06c67dbc11b1a98f0bc46b89f782dc (patch) | |
| tree | 7bbf8ce63db278bd5e143c687d5e3143702a796a /puppet | |
| parent | ab83e7731c78d44b05243d6242d026a97f4e170a (diff) | |
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
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/manila-api.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
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: |