openstack/openstack-helm
Code Issues Proposed changes

Merge pull request #108 from stannum-l/fix-keystone-config

Browse Source 
Removed the ``workers`` configuration from keystone.conf
This commit is contained in:
Brandon B. Jozsa
2017-01-12 17:38:13 -05:00
committed by GitHub
parent 594954a490 da00a3edf6
commit 0bb12fb2ad
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@
debug = {{ .Values.misc.debug }} debug = {{ .Values.misc.debug }}
use_syslog = False use_syslog = False
use_stderr = True use_stderr = True
workers = {{ .Values.misc.workers }}
[database] [database]
connection = mysql+pymysql://{{ .Values.database.keystone_user }}:{{ .Values.database.keystone_password }}@{{ include "keystone_db_host" . }}/{{ .Values.database.keystone_database_name }} connection = mysql+pymysql://{{ .Values.database.keystone_user }}:{{ .Values.database.keystone_password }}@{{ include "keystone_db_host" . }}/{{ .Values.database.keystone_database_name }}

7
keystone/values.yaml
View File

@@ -38,11 +38,11 @@ network:
# alanmeadows(TODO): I seem unable to use {{ .IP }} here # alanmeadows(TODO): I seem unable to use {{ .IP }} here
# but it does work for wsrep.conf in mariadb, I have spent # but it does work for wsrep.conf in mariadb, I have spent
# time trying to figure this out am completely stumped # time trying to figure this out am completely stumped
# #
# helm --debug --dry-run shows me that the config map # helm --debug --dry-run shows me that the config map
# contains {{ .IP }} but its simply translated by K8s # contains {{ .IP }} but its simply translated by K8s
# to "" # to ""
ip_address: "0.0.0.0" ip_address: "0.0.0.0"
database: database:
port: 3306 port: 3306
@@ -53,12 +53,11 @@ database:
keystone_user: keystone keystone_user: keystone
misc: misc:
workers: 8
debug: false debug: false
dependencies: dependencies:
api: api:
jobs: jobs:
- mariadb-seed - mariadb-seed
- keystone-db-sync - keystone-db-sync
service: service: