aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-13 23:33:32 +0000
committerGerrit Code Review <review@openstack.org>2017-03-13 23:33:32 +0000
commit4795a1116850f8bb62e4b179b2190a482a63ac13 (patch)
tree19be6294b79da17df3d20986b80fb568ed8cc8ad /puppet
parentc49fa2625d27dae4dd72d67a013c0e9363d007b9 (diff)
parenta24cb33ec74ffe0013ac843d55d8adb7195c5c4c (diff)
Merge "cinder: switch auth_uri to uri_no_suffix"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/cinder-api.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 140c6f63..958b0e7d 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -80,10 +80,12 @@ outputs:
map_merge:
- get_attr: [CinderBase, role_data, config_settings]
- get_attr: [ApacheServiceBase, role_data, config_settings]
- - cinder::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+ - cinder::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
cinder::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
cinder::keystone::authtoken::password: {get_param: CinderPassword}
cinder::keystone::authtoken::project_name: 'service'
+ cinder::keystone::authtoken::user_domain_name: 'Default'
+ cinder::keystone::authtoken::project_domain_name: 'Default'
cinder::api::enable_proxy_headers_parsing: true
cinder::api::nova_catalog_info: 'compute:nova:internalURL'