openstack
/
puppet-glance
Code Issues Proposed changes

Fix auth_uri introduced bug 

We should pick() the value here otherwise
we are not backward compatible even though
auth_uri is only deprecated.

Change-Id: I43050e5c364b7d526e6b19a3529128d17045080a
This commit is contained in:
Tobias Urdin 2018-05-22 00:17:31 +02:00
parent 71447a4993
commit 9d20663364
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/api.pp
View File

@ -569,7 +569,8 @@ class glance::api(
$keystone_project_name = $::glance::api::authtoken::project_name $keystone_project_name = $::glance::api::authtoken::project_name
$keystone_username = $::glance::api::authtoken::username $keystone_username = $::glance::api::authtoken::username
$keystone_password = $::glance::api::authtoken::password $keystone_password = $::glance::api::authtoken::password
$auth_uri = $::glance::api::authtoken::www_authenticate_uri # TODO(tobasco): Remove pick when auth_uri is removed.
$auth_uri = pick($::glance::api::authtoken::auth_uri, $::glance::api::authtoken::www_authenticate_uri)
$defaults = { $defaults = {
'glance-api' => { 'glance-api' => {
# lint:ignore:140chars # lint:ignore:140chars