From c20c69ee5eee08190cfcbeea54cc89909c7d1860 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <b.kunwar@gmail.com>
Date: Tue, 10 Apr 2018 17:09:27 +0100
Subject: [PATCH] kolla-ansible fix to correct magnum k8s deployment

Magnum was unable to fire up k8s cluster because heat-container-agent
inside kube-master was pointing to internal keystone endpoint instead of
public endpoint. This fix tells kolla ansible to set clients_keystone
auth_uri to public endpoint so that heat-container-agent communication
with heat is successfully authenticated by keystone.

Change-Id: Ida49528f88685710b5e6b8f3c4d4622506af5ae1
Closes-Bug: #1762754
---
 ansible/roles/heat/templates/heat.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 6564f5f8bf..b3fd768a79 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -73,7 +73,7 @@ password = {{ heat_keystone_password }}
 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
 
 [clients_keystone]
-auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
+auth_uri = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}
 
 [oslo_messaging_notifications]
 transport_url = {{ notify_transport_url }}