From: Julie Pichon <jpichon@redhat.com>
Date: Wed, 5 Oct 2016 11:58:21 +0000 (+0100)
Subject: Explicitly use Keystone v2 endpoint in the UI
X-Git-Tag: opnfv-6.0.0~549^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=15c7d4b0af09f3240c23c11c31c67b52a220d0f3;p=apex-puppet-tripleo.git

Explicitly use Keystone v2 endpoint in the UI

The UI expects a Keystone endpoint URL that includes the version
(without it, it is not possible to log in). Looking at the
dist/tripleo_ui_config.js.sample configuration sample in the tripleo-ui
repository, the current expectation is a v2.0 URL so let's use that for
now.

Change-Id: I4ca04b16251fbee264cd4ce5e5433c2c1cb6d2f0
Closes-Bug: #1630546
---

diff --git a/manifests/ui.pp b/manifests/ui.pp
index 3f6d37a..dc51bfc 100644
--- a/manifests/ui.pp
+++ b/manifests/ui.pp
@@ -72,7 +72,7 @@ class tripleo::ui (
   $servername          = $::fqdn,
   $bind_host           = undef,
   $ui_port             = 3000,
-  $keystone_url        = hiera('keystone::endpoint::public_url'),
+  $keystone_url        = hiera('keystone_auth_uri_v2'),
   $heat_url            = hiera('heat::keystone::auth::public_url', undef),
   $ironic_url          = hiera('ironic::keystone::auth::public_url', undef),
   $mistral_url         = hiera('mistral::keystone::auth::public_url', undef),