Commit 97066a1e authored by Benoît Knecht's avatar Benoît Knecht Committed by Guillaume Abrioux
Browse files

ceph-rgw-loadbalancer: Fix keepalived master selection

While 2ca33641

 fixed a bug in the way the `keepalived.conf.j2` template matched
hostnames to set the VRRP `MASTER`/`BACKUP` states, it also introduced a
regression in the case where `virtual_ips` is a list of more than one IP
address.

The previous behavior would result in each host in the `rgwloadbalancers` group
to be `MASTER` for one of the `virtual_ips`, but the new behavior caused the
first host to be `MASTER` for all the IP address in `virtual_ips`.

This commit restores the original behavior.
Signed-off-by: default avatarBenoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit 2bede4762efaf566a7da689dd1021ee66c0c94eb)
parent 2d59f457
......@@ -15,8 +15,8 @@ vrrp_script check_haproxy {
{% for instance in vrrp_instances %}
vrrp_instance {{ instance['name'] }} {
state {{ 'MASTER' if ansible_facts['hostname'] == instance['master'] else 'BACKUP' }}
priority {{ '100' if ansible_facts['hostname'] == instance['master'] else '90' }}
state {{ 'MASTER' if inventory_hostname == instance['master'] else 'BACKUP' }}
priority {{ '100' if inventory_hostname == instance['master'] else '90' }}
interface {{ virtual_ip_interface }}
virtual_router_id {{ 50 + loop.index }}
advert_int 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment