Merge pull request #8 from walteraa/fix_template_error

Fix keepalived config file error when there are no services
aledbf · Sep 18, 2017 · 9006844 · 9006844
2 parents bd955b4 + fd6877a
commit 9006844
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pkg/controller/keepalived.go b/pkg/controller/keepalived.go
@@ -82,6 +82,7 @@ func (k *keepalived) WriteCfg(svcs []vip) error {
 	conf["useUnicast"] = k.useUnicast
 	conf["vrid"] = k.vrid
 	conf["proxyMode"] = k.proxyMode
+  conf["vipIsEmpty"] = len(k.vips) == 0
 
 	if glog.V(2) {
 		b, _ := json.Marshal(conf)

diff --git a/rootfs/keepalived.tmpl b/rootfs/keepalived.tmpl
@@ -5,6 +5,11 @@ global_defs {
   vrrp_iptables {{ .iptablesChain }}
 }
 
+
+#Check if the VIP list is empty
+{{ if not .vipIsEmpty }}
+
+
 {{ if .proxyMode }}
 vrrp_script chk_haproxy {
   script "/haproxy-check.sh"
@@ -65,4 +70,7 @@ virtual_server {{ $svc.IP }} {{ $svc.Port }} {
   {{ end }}
 }
 {{ end }}
-{{ end }}
+{{ end }}
+
+#End if vip list is empty
+{{ end }}