From c50110cf9b33a08c446aca656e11d8cd529302a2 Mon Sep 17 00:00:00 2001
From: Tytus Kurek <tytus.kurek@canonical.com>
Date: Mon, 25 Sep 2017 11:32:07 +0200
Subject: [PATCH] Enable IPv6 check in haproxy template file

This patchset adds IPv6 check to the haproxy template file.

Change-Id: Ib35dd1ac17f38aadf8c1ee3ce182ceca9a6f9316
Depends-On: I1e7329323cbe4ea9d2d79e4196690efa015aa0f4
Closes-Bug: #1719280
---
 templates/haproxy.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/haproxy.cfg b/templates/haproxy.cfg
index 9f48e8e..163faa1 100644
--- a/templates/haproxy.cfg
+++ b/templates/haproxy.cfg
@@ -45,7 +45,9 @@ listen stats {{ options.stat_port }}
 {% for service, ports in options.service_ports.items() -%}
 frontend tcp-in_{{ service }}
     bind *:{{ ports[0] }}
+    {% if options.ipv6_enabled -%}
     bind :::{{ ports[0] }}
+    {% endif -%}
     {% for frontend in cluster.cluster_hosts -%}
     acl net_{{ frontend }} dst {{ cluster.cluster_hosts[frontend]['network'] }}
     use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}