From dcc2259f3b35d5429959050aa2c55dc33d54b0d4 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Tue, 7 Mar 2017 02:05:52 +0000
Subject: [PATCH] KS endpoint type lookup for Horizon

---
 horizon/templates/etc/_local_settings.tpl |  4 ++--
 horizon/values.yaml                       | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/horizon/templates/etc/_local_settings.tpl b/horizon/templates/etc/_local_settings.tpl
index ead052ec36..0becfebbc3 100644
--- a/horizon/templates/etc/_local_settings.tpl
+++ b/horizon/templates/etc/_local_settings.tpl
@@ -144,7 +144,7 @@ SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '{{ include "helm-toolkit.rabbitmq_host" . }}'
+        'LOCATION': '{{ .Values.memcached.host }}:{{ .Values.memcached.port }}'
     }
 }
 
@@ -165,7 +165,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 #    ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
 #]
 
-OPENSTACK_KEYSTONE_URL = "{{ include "helm-toolkit.endpoint_keystone_internal" . }}"
+OPENSTACK_KEYSTONE_URL = "{{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
 
 # Enables keystone web single-sign-on if set to True.
diff --git a/horizon/values.yaml b/horizon/values.yaml
index af3ee6847a..08cace4d4f 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -40,6 +40,10 @@ network:
   node_port: 30000
   enable_node_port: false
 
+memcached:
+  host: memcached
+  port: 11211
+
 local_settings:
   horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c
   debug: "True"
@@ -60,17 +64,16 @@ resources:
       memory: "128Mi"
       cpu: "500m"
 
-# mits:typically overriden by environmental 
+# typically overriden by environmental
 # values, but should include all endpoints
 # required by this chart
 endpoints:
-  keystone:
+    identity:
+    name: keystone
     hosts:
       default: keystone-api
-    path: /v2.0
-    type: identity
+    path: /v3
     scheme: 'http'
     port:
-        admin: 35357
-        public: 5000
-
+      admin: 35357
+      api: 5000