16508c32ee
* Initial Commit of Nova Configuration Overrides This commit is an evolution of the initial keystone configuration overrides work It expands upon that work by introducing many of the same concepts into nova. It differs in that a few concepts were changed. Namely the helm-toolkit/_oslo.tpl concept was abandoned, as there are too many unique oslo paths for configuration elements, so dynamic oslo setting mechanism was moved locally into configmap-etc.yaml, where it is generally used. Secondly, in nova the mount override effort was altered to instead provide mount "append" capability. Keeping the manifest mounts closer to the actual pod, and keeping values.yaml a tad smaller. This still allows the original flexibility of operators adding mounts, but they cannot "undo" any of the charts built in mounts. There were several manual tweaks that needd to be done to _nova.conf.tpl after the oslo-config-gen process this time. This is because there is a bug in the newton version of generating this file. It does not include the proper service authentication credentials in the [keystone_authtoken] section. Future releases have a separate service credentials section so future config generations will likely not need these added lines. * Remove unused values.yaml parameters Fix references to removed helm-toolkit oslo macro * resolve nova feedback * bugfix nova-etc/nova-bin swap
70 lines
2.9 KiB
YAML
70 lines
2.9 KiB
YAML
# Copyright 2017 The Openstack-Helm Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
{{- include "keystone.conf.keystone_values_skeleton" .Values.conf.keystone | trunc 0 -}}
|
|
|
|
{{- if empty .Values.conf.keystone.database.oslo.db.connection -}}
|
|
{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.authenticated_endpoint_uri_lookup"| set .Values.conf.keystone.database.oslo.db "connection" | quote | trunc 0 -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.keystone.default.oslo.messaging.transport_url -}}
|
|
{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.default.oslo.messaging "transport_url" | quote | trunc 0 -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.keystone.cache.oslo.cache -}}
|
|
{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.hostname_endpoint_uri_lookup" | set .Values.conf.keystone.cache.oslo.cache "memcache_servers" | quote | trunc 0 -}}
|
|
{{- end -}}
|
|
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
name: keystone-etc
|
|
data:
|
|
keystone.conf: |+
|
|
{{ if .Values.conf.keystone.override -}}
|
|
{{ .Values.conf.keystone.override | indent 4 }}
|
|
{{- else -}}
|
|
{{- if .Values.conf.keystone.prefix -}}
|
|
{{ .Values.conf.keystone.prefix | indent 4 }}
|
|
{{- end }}
|
|
{{ tuple "etc/_keystone.conf.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
|
{{- end }}
|
|
{{- if .Values.conf.keystone.append -}}
|
|
{{ .Values.conf.keystone.append | indent 4 }}
|
|
{{- end }}
|
|
keystone-paste.ini: |+
|
|
{{ if .Values.conf.paste.override -}}
|
|
{{ .Values.conf.paste.override | indent 4 }}
|
|
{{- else -}}
|
|
{{- if .Values.conf.paste.prefix -}}
|
|
{{ .Values.conf.paste.prefix | indent 4 }}
|
|
{{- end }}
|
|
{{ tuple "etc/_keystone-paste.ini.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
|
{{- end }}
|
|
{{- if .Values.conf.paste.append -}}
|
|
{{ .Values.conf.paste.append | indent 4 }}
|
|
{{- end }}
|
|
policy.json: |+
|
|
{{ if .Values.conf.policy.override -}}
|
|
{{ .Values.conf.policy.override | indent 4 }}
|
|
{{- else -}}
|
|
{{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
|
{{- end }}
|
|
mpm_event.conf: |+
|
|
{{ tuple "etc/_mpm_event.conf.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
|
wsgi-keystone.conf: |+
|
|
{{ tuple "etc/_wsgi-keystone.conf.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
|
sso_callback_template.html: |+
|
|
{{ tuple "etc/_sso_callback_template.html.tpl" . | include "helm-toolkit.template" | indent 4 }}
|