openstack/openstack-helm-infra
Code Issues Proposed changes

HTK: support csv list in oslo conf rendering

Browse Source 
Some configuration options that with older openstack releases
were multistrings have now changed to csv values under a single
key, this change makes that simple to accomodate.

Change-Id: Id941a1e56e4a852d764084c958c13588b8e3ed85
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2019-09-27 09:42:36 -05:00 committed by Pete Birley
parent 694fc25985
commit 2f64562bba
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helm-toolkit/templates/utils/_to_oslo_conf.tpl
View File

@ -28,6 +28,12 @@ values: |
values: values:
- messagingv2 - messagingv2
- log - log
oslo_messaging_notifications_stein:
driver: # An example of a csv option's syntax
type: csv
values:
- messagingv2
- log
security_compliance: security_compliance:
password_expires_ignore_user_ids: password_expires_ignore_user_ids:
# Values in a list will be converted to a comma separated key # Values in a list will be converted to a comma separated key
@ -41,6 +47,8 @@ return: |
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = messagingv2 driver = messagingv2
driver = log driver = log
[oslo_messaging_notifications_stein]
driver = messagingv2,log
[security_compliance] [security_compliance]
password_expires_ignore_user_ids = 123,456 password_expires_ignore_user_ids = 123,456
*/}} */}}
@ -57,7 +65,9 @@ return: |
{{- range $k, $multistringValue := $value.values -}} {{- range $k, $multistringValue := $value.values -}}
{{ $key }} = {{ $multistringValue }} {{ $key }} = {{ $multistringValue }}
{{ end -}} {{ end -}}
{{- end -}} {{ else if eq $value.type "csv" -}}
{{ $key }} = {{ include "helm-toolkit.utils.joinListWithComma" $value.values }}
{{ end -}}
{{- else -}} {{- else -}}
{{ $key }} = {{ $value }} {{ $key }} = {{ $value }}
{{ end -}} {{ end -}}