diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-13 18:44:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-13 18:44:35 +0000 |
| commit | 95a0b17f3eadaaf697ac3ac18de614f4fcb31627 (patch) | |
| tree | b48829a614549047293ac34241251d2bcdcb26d3 | |
| parent | b2ba3de8233639fa1ac9258a0e409bc250f9f84f (diff) | |
| parent | 154e2d2cc3aac092ca36968d2dc450c71e58a588 (diff) | |
Merge "heat: switch auth_uri to use uri_no_suffix"
| -rw-r--r-- | puppet/services/heat-base.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index e83a9edd..6ada9c25 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -125,7 +125,9 @@ outputs: value: 'role:admin' heat::rabbit_heartbeat_timeout_threshold: 60 heat::keystone::authtoken::project_name: 'service' - heat::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } + heat::keystone::authtoken::user_domain_name: 'Default' + heat::keystone::authtoken::project_domain_name: 'Default' + heat::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } heat::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } heat::keystone::authtoken::password: {get_param: HeatPassword} heat::keystone::domain::domain_name: 'heat_stack' |