From 785fcfd33d29ddfee54f09cd6bf126990d64e4dd Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Tue, 6 Nov 2018 16:53:38 +0100
Subject: [PATCH] Switch to using public endpoint for URIs

The URI options in Heat all need to be public facing or otherwise
any instances spawned by Heat could have problems working with
things like SoftwareDeployment's such as Heat.

This patch makes the appropriate changes.

Change-Id: I210cedbdc527d981c49ff52264ee6028242202d2
---
 templates/heat.conf.j2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/heat.conf.j2 b/templates/heat.conf.j2
index d459fc5..5d4610d 100644
--- a/templates/heat.conf.j2
+++ b/templates/heat.conf.j2
@@ -43,13 +43,13 @@ endpoint_type = {{ heat_clients_heat_endpoint }}
 [clients_keystone]
 insecure = {{ keystone_service_internaluri_insecure | bool }}
 endpoint_type = {{ heat_clients_endpoint }}
-auth_uri = {{ keystone_service_internaluri }}
+auth_uri = {{ keystone_service_publicuri }}
 
 [database]
 connection = mysql+pymysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ heat_galera_address }}/{{ heat_galera_database }}?charset=utf8{% if heat_galera_use_ssl | bool %}&ssl_ca={{ heat_galera_ssl_ca_cert }}{% endif %}
 
 [ec2authtoken]
-auth_uri = {{ keystone_service_internalurl }}
+auth_uri = {{ keystone_service_publicuri }}
 
 [heat_api]
 bind_port = {{ heat_service_port }}
@@ -81,7 +81,7 @@ trace_sqlalchemy = {{ heat_profiler_trace_sqlalchemy }}
 insecure = {{ keystone_service_internaluri_insecure | bool }}
 auth_type = {{ heat_keystone_auth_plugin }}
 auth_url = {{ keystone_service_adminurl }}
-www_authenticate_uri = {{ keystone_service_internaluri }}
+www_authenticate_uri = {{ keystone_service_publicuri }}
 project_domain_id = {{ heat_service_project_domain_id }}
 user_domain_id = {{ heat_service_user_domain_id }}
 project_name = {{ heat_service_project_name }}