Browse Source

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
tags/13.1.0
Tobias Urdin 1 year ago
parent
commit
9d20663364
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      manifests/api.pp

+ 2
- 1
manifests/api.pp View File

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

Loading…
Cancel
Save