From da00a3edf680af8d015b93c47a41e51b878e8256 Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Thu, 12 Jan 2017 11:19:58 -0600 Subject: [PATCH] Removed the ``worker`` from keystone configuration The configuration of ``worker`` can be removed for two reasons: * In Mitaka (and onward), it is two separate parameters: ``public_workers`` and ``admin_workers`` under section [eventlet_server], as shown in [1]. In master (Ocata), these options were removed. * In the preferred keystone deployment of using u/wsgi, and not eventlet server, this setting does not really take effect - as Apache will manage this instead of keystone. These options can be removed. Also, removed extra EOL spaces. [1] https://github.com/openstack/keystone/blob/stable/mitaka/etc/keystone.conf.sample#L678-L696 --- keystone/templates/etc/_keystone.conf.tpl | 1 - keystone/values.yaml | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/keystone/templates/etc/_keystone.conf.tpl b/keystone/templates/etc/_keystone.conf.tpl index 58603001ba..a503b4a0e5 100644 --- a/keystone/templates/etc/_keystone.conf.tpl +++ b/keystone/templates/etc/_keystone.conf.tpl @@ -2,7 +2,6 @@ debug = {{ .Values.misc.debug }} use_syslog = False use_stderr = True -workers = {{ .Values.misc.workers }} [database] connection = mysql+pymysql://{{ .Values.database.keystone_user }}:{{ .Values.database.keystone_password }}@{{ include "keystone_db_host" . }}/{{ .Values.database.keystone_database_name }} diff --git a/keystone/values.yaml b/keystone/values.yaml index a89452e14d..e6ead52acc 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -38,11 +38,11 @@ network: # alanmeadows(TODO): I seem unable to use {{ .IP }} here # but it does work for wsrep.conf in mariadb, I have spent # time trying to figure this out am completely stumped - # + # # helm --debug --dry-run shows me that the config map # contains {{ .IP }} but its simply translated by K8s # to "" - ip_address: "0.0.0.0" + ip_address: "0.0.0.0" database: port: 3306 @@ -53,12 +53,11 @@ database: keystone_user: keystone misc: - workers: 8 debug: false dependencies: api: - jobs: + jobs: - mariadb-seed - keystone-db-sync service: