From de7d71558e129060338dba93a0584b95f9487185 Mon Sep 17 00:00:00 2001
From: Larry Rensing <larry.rensing@gmail.com>
Date: Wed, 15 Mar 2017 09:01:07 -0500
Subject: [PATCH] corrected memcached host

---
 helm-toolkit/templates/_hosts.tpl         | 2 +-
 keystone/templates/etc/_keystone.conf.tpl | 4 ++--
 keystone/values.yaml                      | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/helm-toolkit/templates/_hosts.tpl b/helm-toolkit/templates/_hosts.tpl
index b2a41cd456..502593ca32 100644
--- a/helm-toolkit/templates/_hosts.tpl
+++ b/helm-toolkit/templates/_hosts.tpl
@@ -29,7 +29,7 @@
 #-----------------------------------------
 
 # infrastructure services
-{{- define "helm-toolkit.rabbitmq_host"}}memcached.{{.Release.Namespace}}.svc.{{ include "helm-toolkit.region" . }}.{{ include "helm-toolkit.tld" . }}{{- end}}
+{{- define "helm-toolkit.rabbitmq_host"}}rabbitmq.{{.Release.Namespace}}.svc.{{ include "helm-toolkit.region" . }}.{{ include "helm-toolkit.tld" . }}{{- end}}
 {{- define "helm-toolkit.mariadb_host"}}mariadb.{{.Release.Namespace}}.svc.{{ include "helm-toolkit.region" . }}.{{ include "helm-toolkit.tld" . }}{{- end}}
 {{- define "helm-toolkit.postgresql_host"}}postgresql.{{.Release.Namespace}}.svc.{{ include "helm-toolkit.region" . }}.{{ include "helm-toolkit.tld" . }}{{- end}}
 
diff --git a/keystone/templates/etc/_keystone.conf.tpl b/keystone/templates/etc/_keystone.conf.tpl
index 551f17ff67..8f16b85ae2 100644
--- a/keystone/templates/etc/_keystone.conf.tpl
+++ b/keystone/templates/etc/_keystone.conf.tpl
@@ -22,14 +22,14 @@ connection = mysql+pymysql://{{ .Values.database.keystone_user }}:{{ .Values.dat
 max_retries = -1
 
 [memcache]
-servers = {{ include "helm-toolkit.rabbitmq_host" . }}:11211
+servers = "{{ .Values.memcached.host }}:{{ .Values.memcached.port }}"
 
 [token]
 provider = {{ .Values.api.token.provider }}
 
 [cache]
 backend = dogpile.cache.memcached
-memcache_servers = {{ include "helm-toolkit.rabbitmq_host" . }}:11211
+memcache_servers = "{{ .Values.memcached.host }}:{{ .Values.memcached.port }}"
 config_prefix = cache.keystone
 enabled = True
 
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 05bf4a52c7..51b711f268 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -56,6 +56,10 @@ network:
     admin: 35357
     api: 5000
 
+memcached:
+  host: memcached
+  port: 11211
+
 database:
   port: 3306
   root_user: root