From: Ben Nemec <bnemec@redhat.com>
Date: Thu, 7 Jan 2016 21:00:35 +0000 (-0600)
Subject: Configure keystone public_endpoint
X-Git-Tag: opnfv-6.0.0~2175^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ae911c2c9c2f48f4a3278c47fe05fbf552bdaeca;p=apex-tripleo-heat-templates.git

Configure keystone public_endpoint

We need this set for SSL or keystone returns a non-https address.
It shouldn't hurt anything to set this in the non-SSL case since
the value will still be correct and the behavior will be the same
as if it were unset.

Change-Id: Iea3ea1d25dfc462fa844d3c12e6070f2c9b42036
---

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index df51f43d..0acd4c52 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1336,7 +1336,7 @@ resources:
                 keystone::admin_workers: {get_input: keystone_workers}
                 keystone::public_workers: {get_input: keystone_workers}
                 keystone_enable_db_purge: {get_input: keystone_enable_db_purge}
-
+                keystone::public_endpoint: {get_input: keystone_public_url}
                 # MongoDB
                 mongodb::server::bind_ip: {get_input: mongo_db_network}
                 mongodb::server::nojournal: {get_input: mongodb_no_journal}