openstack/puppet-heat
Code Issues Proposed changes

Fix backwards incompatibility with auth_uri

Browse Source 
Idb0f408776ef27f16a522e4443531fd97276669b switches to use
www_authenticate_uri but it is not backwards incompatible for folks who
have yet to switch to use www_authenticate_uri. We should still support
auth_uri for the time beaing.

Change-Id: I132fa8ebf91e932cd7fbc610dccd332348d52d49
Closes-Bug: #1764598
This commit is contained in:
Alex Schultz 2018-04-16 20:24:04 -06:00
parent 60e8ae8909
commit fb395a3fbb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/init.pp
View File

@ -470,7 +470,8 @@ instead.")
password => $amqp_password,
}
$auth_uri = $::heat::keystone::authtoken::www_authenticate_uri
# TODO(aschultz): remove this after completely switched to www_authenticate_uri
$auth_uri = pick($::heat::keystone::authtoken::auth_uri, $::heat::keystone::authtoken::www_authenticate_uri)
$auth_url = $::heat::keystone::authtoken::auth_url
$keystone_username = $::heat::keystone::authtoken::username
$keystone_password = $::heat::keystone::authtoken::password