From f1ef55de6ec8768a91bd3cda94cb5f74f22411bd Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 12 Jan 2017 23:50:26 +0000
Subject: [PATCH] Update Heat to mount Policy at engine statefulsets and set
 client endpoints

---
 heat/templates/etc/_heat.conf.tpl      | 8 ++++++++
 heat/templates/statefulset-engine.yaml | 7 +++++++
 heat/values.yaml                       | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/heat/templates/etc/_heat.conf.tpl b/heat/templates/etc/_heat.conf.tpl
index e902fe7114..b268a6ecfd 100644
--- a/heat/templates/etc/_heat.conf.tpl
+++ b/heat/templates/etc/_heat.conf.tpl
@@ -80,3 +80,11 @@ region_name = {{ .Values.keystone.heat_trustee_region_name }}
 user_domain_name = {{ .Values.keystone.heat_trustee_user_domain }}
 username = {{ .Values.keystone.heat_trustee_user }}
 password = {{ .Values.keystone.heat_trustee_password }}
+
+
+[clients]
+endpoint_type = internalURL
+
+[clients_keystone]
+endpoint_type = internalURL
+auth_uri = {{ include "endpoint_keystone_internal" . }}
diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml
index 0478e39173..36aacba350 100644
--- a/heat/templates/statefulset-engine.yaml
+++ b/heat/templates/statefulset-engine.yaml
@@ -55,6 +55,10 @@ spec:
               mountPath: /etc/heat/conf/heat.conf
               subPath: heat.conf
               readOnly: true
+            - name: heatpolicy
+              mountPath: /etc/heat/policy.json
+              subPath: policy.json
+              readOnly: true
       volumes:
         - name: pod-etc-heat
           emptyDir: {}
@@ -63,3 +67,6 @@ spec:
         - name: heatconf
           configMap:
             name: heat-etc
+        - name: heatpolicy
+          configMap:
+            name: heat-etc
diff --git a/heat/values.yaml b/heat/values.yaml
index 6373aa22de..ecd9c02ccf 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -108,7 +108,7 @@ resources:
     workers: 8
 
 misc:
-  debug: false
+  debug: true
 
 secrets:
   keystone_admin: