From 14a299596c0c94eacce3a2eda77e751b3a7a3ea5 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Tue, 15 May 2018 15:07:59 +0200
Subject: [PATCH] Always use publicURL for heat client

We use the global client config for endpoint_type
which means that all clients will inherit this setting
but heat client must remain using the publicURL since
that is used for heat stack output.

Change-Id: Ibb6395e1a65cdb5e09f6a02ae03ee529da0c8d0e
Closes-Bug: #1770144
---
 templates/icehouse/heat.conf | 5 +++++
 templates/mitaka/heat.conf   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/templates/icehouse/heat.conf b/templates/icehouse/heat.conf
index 99ce0b4..59380b8 100644
--- a/templates/icehouse/heat.conf
+++ b/templates/icehouse/heat.conf
@@ -89,4 +89,9 @@ workers = {{ workers }}
 {% if use_internal_endpoints -%}
 [clients]
 endpoint_type = internalURL
+
+[heat_clients]
+# See LP 1770144
+endpoint_type = publicURL
+
 {%- endif %}
diff --git a/templates/mitaka/heat.conf b/templates/mitaka/heat.conf
index d8c1d2d..43518f9 100644
--- a/templates/mitaka/heat.conf
+++ b/templates/mitaka/heat.conf
@@ -69,4 +69,9 @@ workers = {{ workers }}
 {% if use_internal_endpoints -%}
 [clients]
 endpoint_type = internalURL
+
+[heat_clients]
+# See LP 1770144
+endpoint_type = publicURL
+
 {%- endif %}