ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Benoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit 3116f46422)
pull/6520/head
Benoît Knecht 2020-06-01 17:09:18 +02:00 committed by Guillaume Abrioux
parent 84a0ed440d
commit 6451d3681b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-rgw-loadbalancer/tasks/pre_requisite.yml
View File

@ -19,7 +19,7 @@
- name: set_fact vip to vrrp_instance - name: set_fact vip to vrrp_instance
set_fact: set_fact:
vrrp_instances: "{{ vrrp_instances | default([]) | union([{ 'name': 'VI_' + index|string , 'vip': item }]) }}" vrrp_instances: "{{ vrrp_instances | default([]) | union([{ 'name': 'VI_' + index|string , 'vip': item, 'master': groups[rgwloadbalancer_group_name][index] }]) }}"
loop: "{{ virtual_ips | flatten(levels=1) }}" loop: "{{ virtual_ips | flatten(levels=1) }}"
loop_control: loop_control:
index_var: index index_var: index

4
roles/ceph-rgw-loadbalancer/templates/keepalived.conf.j2
View File

@ -15,8 +15,8 @@ vrrp_script check_haproxy {
{% for instance in vrrp_instances %} {% for instance in vrrp_instances %}
vrrp_instance {{ instance['name'] }} { vrrp_instance {{ instance['name'] }} {
state {{ 'MASTER' if inventory_hostname == groups[rgwloadbalancer_group_name][0] else 'BACKUP' }} state {{ 'MASTER' if inventory_hostname == instance['master'] else 'BACKUP' }}
priority {{ '100' if inventory_hostname == groups[rgwloadbalancer_group_name][0] else '90' }} priority {{ '100' if inventory_hostname == instance['master'] else '90' }}
interface {{ virtual_ip_interface }} interface {{ virtual_ip_interface }}
virtual_router_id {{ 50 + loop.index }} virtual_router_id {{ 50 + loop.index }}
advert_int 1 advert_int 1