openstack/openstack-helm
Code Issues Proposed changes

Merge pull request #280 from larryrensing/bug/fix-memcached-hosts

Browse Source 
bugfix: corrected memcached host
This commit is contained in:
Brandon B. Jozsa 2017-03-19 20:35:42 -04:00 committed by GitHub
commit abbe14aa09
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm-toolkit/templates/_hosts.tpl
View File

@ -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}}

4
keystone/templates/etc/_keystone.conf.tpl
View File

@ -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

4
keystone/values.yaml
View File

@ -56,6 +56,10 @@ network:
admin: 35357
api: 5000
memcached:
host: memcached
port: 11211
database:
port: 3306
root_user: root