diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-14 14:00:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-14 14:00:00 +0000 |
| commit | ae27f19affe25f06f1bf5641b04b396ac7be4b28 (patch) | |
| tree | 91374cac761cb682b0bf06c13be7eeb129c8e2fc | |
| parent | c09db422cf4eddbde5d4ce395cc1b7ce5eeac670 (diff) | |
| parent | 024d76534e5d69239a2a8290dab110bfa3c75306 (diff) | |
| download | kolla-ae27f19affe25f06f1bf5641b04b396ac7be4b28.tar.gz kolla-ae27f19affe25f06f1bf5641b04b396ac7be4b28.zip | |
Merge "Use nopreempt for keepalived"
| -rw-r--r-- | ansible/roles/haproxy/templates/keepalived.conf.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ansible/roles/haproxy/templates/keepalived.conf.j2 b/ansible/roles/haproxy/templates/keepalived.conf.j2 index d599ea721..e0467fa78 100644 --- a/ansible/roles/haproxy/templates/keepalived.conf.j2 +++ b/ansible/roles/haproxy/templates/keepalived.conf.j2 @@ -6,7 +6,8 @@ vrrp_script check_alive { } vrrp_instance kolla_internal_vip { - state MASTER + state BACKUP + nopreempt interface {{ api_interface }} virtual_router_id 51 priority {{ groups['haproxy'].index(inventory_hostname) + 1 }} @@ -25,7 +26,8 @@ vrrp_instance kolla_internal_vip { {% if haproxy_enable_external_vip | bool %} vrrp_instance kolla_external_vip { - state MASTER + state BACKUP + nopreempt interface {{ kolla_external_vip_interface }} virtual_router_id 52 priority {{ groups['haproxy'].index(inventory_hostname) + 1 }} |