openstack/openstack-helm
Code Issues Proposed changes

Rename JoinListWithColon to JoinListWithComma

Browse Source
This commit is contained in:
Darla 2017-01-29 13:27:36 -06:00 committed by Alan Meadows
parent 0cf9463c8a
commit d18f333bbf
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/templates/etc/_cinder.conf.tpl
View File

@ -15,7 +15,7 @@ api_paste_config = /etc/cinder/api-paste.ini
glance_api_servers = "{{ .Values.glance.proto }}://{{ .Values.glance.host }}:{{ .Values.glance.port }}" glance_api_servers = "{{ .Values.glance.proto }}://{{ .Values.glance.host }}:{{ .Values.glance.port }}"
glance_api_version = {{ .Values.glance.version }} glance_api_version = {{ .Values.glance.version }}
enabled_backends = {{ include "joinListWithColon" .Values.backends.enabled }} enabled_backends = {{ include "joinListWithComma" .Values.backends.enabled }}
auth_strategy = keystone auth_strategy = keystone
os_region_name = {{ .Values.keystone.cinder_region_name }} os_region_name = {{ .Values.keystone.cinder_region_name }}

2
common/templates/_funcs.tpl
View File

@ -1,4 +1,4 @@
{{- define "joinListWithColon" -}} {{- define "joinListWithComma" -}}
{{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }} {{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }}
{{- end -}} {{- end -}}

6
common/templates/snippets/_k8s_init_dep_check.tpl
View File

@ -30,15 +30,15 @@
}, },
{ {
"name": "DEPENDENCY_SERVICE", "name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" $deps.service }}" "value": "{{ include "joinListWithComma" $deps.service }}"
}, },
{ {
"name": "DEPENDENCY_JOBS", "name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" $deps.jobs }}" "value": "{{ include "joinListWithComma" $deps.jobs }}"
}, },
{ {
"name": "DEPENDENCY_DAEMONSET", "name": "DEPENDENCY_DAEMONSET",
"value": "{{ include "joinListWithColon" $deps.daemonset }}" "value": "{{ include "joinListWithComma" $deps.daemonset }}"
}, },
{ {
"name": "COMMAND", "name": "COMMAND",

8
neutron/templates/etc/_ml2-conf.ini.tpl
View File

@ -1,11 +1,11 @@
[ml2] [ml2]
# Changing type_drivers after bootstrap can lead to database inconsistencies # Changing type_drivers after bootstrap can lead to database inconsistencies
type_drivers = {{ include "joinListWithColon" .Values.ml2.type_drivers }} type_drivers = {{ include "joinListWithComma" .Values.ml2.type_drivers }}
tenant_network_types = {{ .Values.ml2.tenant_network_types }} tenant_network_types = {{ .Values.ml2.tenant_network_types }}
mechanism_drivers = {{ include "joinListWithColon" .Values.ml2.mechanism_drivers }} mechanism_drivers = {{ include "joinListWithComma" .Values.ml2.mechanism_drivers }}
[ml2_type_flat] [ml2_type_flat]
flat_networks = {{ include "joinListWithColon" .Values.ml2.ml2_type_flat.flat_networks }} flat_networks = {{ include "joinListWithComma" .Values.ml2.ml2_type_flat.flat_networks }}
[ml2_type_gre] [ml2_type_gre]
# (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges # (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges
@ -35,7 +35,7 @@ arp_responder = false
{{- end }} {{- end }}
[ovs] [ovs]
bridge_mappings = {{ include "joinListWithColon" .Values.ml2.ovs.bridge_mappings }} bridge_mappings = {{ include "joinListWithComma" .Values.ml2.ovs.bridge_mappings }}
tenant_network_type = {{ .Values.ml2.agent.tunnel_types }} tenant_network_type = {{ .Values.ml2.agent.tunnel_types }}
[vxlan] [vxlan]