diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-13 18:49:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-13 18:49:35 +0000 |
| commit | 43b30445a8baf6c5ee88620082bc615c0c2fc493 (patch) | |
| tree | 1ca604874080265bf04836183e20960bd36423bf /puppet | |
| parent | 95a0b17f3eadaaf697ac3ac18de614f4fcb31627 (diff) | |
| parent | c82a1ae68c06c67dbc11b1a98f0bc46b89f782dc (diff) | |
Merge "manila: switch auth_uri to use uri_no_suffix"
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: |