From d18f333bbf6da5862c98a446e7e8f84a67a206c8 Mon Sep 17 00:00:00 2001
From: Darla <alraddarla@users.noreply.github.com>
Date: Sun, 29 Jan 2017 13:27:36 -0600
Subject: [PATCH] Rename JoinListWithColon to JoinListWithComma

---
 cinder/templates/etc/_cinder.conf.tpl             | 2 +-
 common/templates/_funcs.tpl                       | 2 +-
 common/templates/snippets/_k8s_init_dep_check.tpl | 6 +++---
 neutron/templates/etc/_ml2-conf.ini.tpl           | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cinder/templates/etc/_cinder.conf.tpl b/cinder/templates/etc/_cinder.conf.tpl
index a576fe1fa0..1c8c1052da 100644
--- a/cinder/templates/etc/_cinder.conf.tpl
+++ b/cinder/templates/etc/_cinder.conf.tpl
@@ -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_version = {{ .Values.glance.version }}
 
-enabled_backends = {{  include "joinListWithColon" .Values.backends.enabled }}
+enabled_backends = {{  include "joinListWithComma" .Values.backends.enabled }}
 
 auth_strategy = keystone
 os_region_name = {{ .Values.keystone.cinder_region_name }}
diff --git a/common/templates/_funcs.tpl b/common/templates/_funcs.tpl
index fe6c9a675e..d3a25177ce 100644
--- a/common/templates/_funcs.tpl
+++ b/common/templates/_funcs.tpl
@@ -1,4 +1,4 @@
-{{- define "joinListWithColon" -}}
+{{- define "joinListWithComma" -}}
 {{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }}
 {{- end -}}
 
diff --git a/common/templates/snippets/_k8s_init_dep_check.tpl b/common/templates/snippets/_k8s_init_dep_check.tpl
index d55e0bc654..4deb1b762c 100644
--- a/common/templates/snippets/_k8s_init_dep_check.tpl
+++ b/common/templates/snippets/_k8s_init_dep_check.tpl
@@ -30,15 +30,15 @@
     },
     {
       "name": "DEPENDENCY_SERVICE",
-      "value": "{{  include "joinListWithColon"  $deps.service }}"
+      "value": "{{  include "joinListWithComma"  $deps.service }}"
     },
     {
       "name": "DEPENDENCY_JOBS",
-      "value": "{{  include "joinListWithColon" $deps.jobs }}"
+      "value": "{{  include "joinListWithComma" $deps.jobs }}"
     },
     {
       "name": "DEPENDENCY_DAEMONSET",
-      "value": "{{  include "joinListWithColon" $deps.daemonset }}"
+      "value": "{{  include "joinListWithComma" $deps.daemonset }}"
     },
     {
       "name": "COMMAND",
diff --git a/neutron/templates/etc/_ml2-conf.ini.tpl b/neutron/templates/etc/_ml2-conf.ini.tpl
index 8a903a1715..7219aa7f29 100644
--- a/neutron/templates/etc/_ml2-conf.ini.tpl
+++ b/neutron/templates/etc/_ml2-conf.ini.tpl
@@ -1,11 +1,11 @@
 [ml2]
 # 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 }}
-mechanism_drivers = {{ include "joinListWithColon" .Values.ml2.mechanism_drivers }}
+mechanism_drivers = {{ include "joinListWithComma" .Values.ml2.mechanism_drivers }}
 
 [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]
 # (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges
@@ -35,7 +35,7 @@ arp_responder = false
 {{- end }}
 
 [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 }}
 
 [vxlan]