Merge "Allow outward_rabbitmq with enable_outward_rabbitmq"

This commit is contained in:
Jenkins 2017-10-12 12:14:33 +00:00 committed by Gerrit Code Review
commit a08766b29a

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