summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-03-10 12:21:12 -0500
committerEmilien Macchi <emilien@redhat.com>2017-03-13 08:09:16 -0400
commit154e2d2cc3aac092ca36968d2dc450c71e58a588 (patch)
tree0d9e0f292e0bca181110c3ca18246e582782b394 /puppet
parentab83e7731c78d44b05243d6242d026a97f4e170a (diff)
heat: switch auth_uri to use uri_no_suffix
Switch Heat to use auth_uri with keystone versionless endpoint. Change-Id: Iddd091a659d37d965b216db9f536d30245cd3c3a Partial-implement: blueprint keystone-v3
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/heat-base.yaml4
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'