openstack/kolla-ansible
Code Issues Proposed changes

Merge "When two interfaces are used for two VIPs, tie them together"

Browse Source
This commit is contained in:
Jenkins 2016-04-01 19:11:33 +00:00 committed by Gerrit Code Review
commit d544a4f3cd
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ansible/roles/haproxy/templates/keepalived.conf.j2
View File

@ -13,28 +13,16 @@ vrrp_instance kolla_internal_vip {
priority {{ groups['haproxy'].index(inventory_hostname) + 1 }} priority {{ groups['haproxy'].index(inventory_hostname) + 1 }}
advert_int 1 advert_int 1
virtual_ipaddress { virtual_ipaddress {
{{ kolla_internal_vip_address }} {{ kolla_internal_vip_address }} dev {{ api_interface }}
}
authentication {
auth_type PASS
auth_pass {{ keepalived_password }}
}
track_script {
check_alive
}
}
{% if haproxy_enable_external_vip | bool %} {% if haproxy_enable_external_vip | bool %}
vrrp_instance kolla_external_vip { {{ kolla_external_vip_address }} dev {{ kolla_external_vip_interface }}
state BACKUP {% endif %}
nopreempt
interface {{ kolla_external_vip_interface }}
virtual_router_id 52
priority {{ groups['haproxy'].index(inventory_hostname) + 1 }}
advert_int 1
virtual_ipaddress {
{{ kolla_external_vip_address }}
} }
{% if haproxy_enable_external_vip | bool and api_interface != kolla_external_vip_interface %}
track_interface {
{{ kolla_external_vip_interface }}
}
{% endif %}
authentication { authentication {
auth_type PASS auth_type PASS
auth_pass {{ keepalived_password }} auth_pass {{ keepalived_password }}
@ -43,4 +31,3 @@ vrrp_instance kolla_external_vip {
check_alive check_alive
} }
} }
{% endif %}