openstack/kolla-ansible
Code Issues Proposed changes

Allow outward_rabbitmq with enable_outward_rabbitmq

Browse Source 
outward_rabbitmq is determined  using enable_outward_rabbitmq
property rather than current haproxy_enable_external_vip

Change-Id: Iee096ab50fd4d9f5f3fe05880d0e0a7842c59d0a
Closes-Bug: 1722854
This commit is contained in:
root 2017-10-11 17:15:33 +01:00 committed by serlex
parent 97cdf98f7b
commit d55f2785e3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -49,7 +49,6 @@ listen outward_rabbitmq_management
{% for host in groups['outward-rabbitmq'] %} {% 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 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 %} {% endfor %}
{% if haproxy_enable_external_vip | bool %}
listen outward_rabbitmq_external listen outward_rabbitmq_external
mode tcp mode tcp
@ -62,7 +61,6 @@ listen outward_rabbitmq_external
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %}
{% if enable_mongodb | bool %} {% if enable_mongodb | bool %}
listen mongodb listen mongodb