From d55f2785e30246a64af493d87ac4c05ab0227e74 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Oct 2017 17:15:33 +0100 Subject: [PATCH] Allow outward_rabbitmq with enable_outward_rabbitmq outward_rabbitmq is determined using enable_outward_rabbitmq property rather than current haproxy_enable_external_vip Change-Id: Iee096ab50fd4d9f5f3fe05880d0e0a7842c59d0a Closes-Bug: 1722854 --- ansible/roles/haproxy/templates/haproxy.cfg.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index 837ec8630e..726fa7f742 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -49,7 +49,6 @@ listen outward_rabbitmq_management {% for host in groups['outward-rabbitmq'] %} server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ outward_rabbitmq_management_port }} check inter 2000 rise 2 fall 5 {% endfor %} -{% if haproxy_enable_external_vip | bool %} listen outward_rabbitmq_external mode tcp @@ -62,7 +61,6 @@ listen outward_rabbitmq_external {% endfor %} {% endif %} {% endif %} -{% endif %} {% if enable_mongodb | bool %} listen mongodb