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
This commit is contained in:
Tin Lam 2017-01-12 11:19:58 -06:00
parent 2f87853e16
commit da00a3edf6
2 changed files with 3 additions and 5 deletions

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

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: