openstack/openstack-ansible
Code Issues Proposed changes

Switch keepalived vrrp version from 2 to 3

Browse Source 
This patch updates the keepalived vrrp_version from
2 to 3 and removes vrrp authentication.

Change-Id: Ia1b906de69be7bf623460a88758deed3ce8e22c3
This commit is contained in:
James Denton 2022-09-13 14:39:31 -05:00
parent 223cb7ccf7
commit 80e8fe02ad
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/openstack_deploy/user_secrets.yml
View File

@ -198,7 +198,6 @@ swift_oslomsg_notify_password:
## haproxy stats password ## haproxy stats password
haproxy_stats_password: haproxy_stats_password:
haproxy_keepalived_authentication_password:
## Magnum Options ## Magnum Options
magnum_service_password: magnum_service_password:

3
inventory/group_vars/haproxy/keepalived.yml
View File

@ -23,6 +23,7 @@ keepalived_internal_ping_address: "{{ keepalived_ping_address }}"
keepalived_global_defs: keepalived_global_defs:
- "enable_script_security" - "enable_script_security"
- script_user root - script_user root
- vrrp_version 3
keepalived_scripts: keepalived_scripts:
haproxy_check_script: haproxy_check_script:
@ -59,7 +60,6 @@ _keepalived_default_instances:
state: "{{ (groups['haproxy'].index(inventory_hostname) == 0) | ternary('MASTER', 'BACKUP') }}" state: "{{ (groups['haproxy'].index(inventory_hostname) == 0) | ternary('MASTER', 'BACKUP') }}"
virtual_router_id: "{{ haproxy_keepalived_external_virtual_router_id | default ('10') }}" virtual_router_id: "{{ haproxy_keepalived_external_virtual_router_id | default ('10') }}"
priority: "{{ (groups['haproxy']|length-groups['haproxy'].index(inventory_hostname))*50 }}" priority: "{{ (groups['haproxy']|length-groups['haproxy'].index(inventory_hostname))*50 }}"
authentication_password: "{{ haproxy_keepalived_authentication_password }}"
vips: vips:
- "{{ haproxy_keepalived_external_vip_cidr | default('169.254.1.1/24') }} dev {{ haproxy_keepalived_external_interface | default(management_bridge) }}" - "{{ haproxy_keepalived_external_vip_cidr | default('169.254.1.1/24') }} dev {{ haproxy_keepalived_external_interface | default(management_bridge) }}"
track_scripts: "{{ keepalived_scripts | dict2items | json_query('[*].{name: key, instance: value.instance}') | rejectattr('instance', 'equalto', 'internal') | map(attribute='name') | list }}" track_scripts: "{{ keepalived_scripts | dict2items | json_query('[*].{name: key, instance: value.instance}') | rejectattr('instance', 'equalto', 'internal') | map(attribute='name') | list }}"
@ -68,7 +68,6 @@ _keepalived_default_instances:
state: "{{ (groups['haproxy'].index(inventory_hostname) == 0) | ternary('MASTER', 'BACKUP') }}" state: "{{ (groups['haproxy'].index(inventory_hostname) == 0) | ternary('MASTER', 'BACKUP') }}"
virtual_router_id: "{{ haproxy_keepalived_internal_virtual_router_id | default ('11') }}" virtual_router_id: "{{ haproxy_keepalived_internal_virtual_router_id | default ('11') }}"
priority: "{{ (groups['haproxy']|length-groups['haproxy'].index(inventory_hostname))*50 }}" priority: "{{ (groups['haproxy']|length-groups['haproxy'].index(inventory_hostname))*50 }}"
authentication_password: "{{ haproxy_keepalived_authentication_password }}"
vips: vips:
- "{{ haproxy_keepalived_internal_vip_cidr | default('169.254.2.1/24') }} dev {{ haproxy_keepalived_internal_interface | default(management_bridge) }}" - "{{ haproxy_keepalived_internal_vip_cidr | default('169.254.2.1/24') }} dev {{ haproxy_keepalived_internal_interface | default(management_bridge) }}"
track_scripts: "{{ keepalived_scripts | dict2items | json_query('[*].{name: key, instance: value.instance}') | rejectattr('instance', 'equalto', 'external') | map(attribute='name') | list }}" track_scripts: "{{ keepalived_scripts | dict2items | json_query('[*].{name: key, instance: value.instance}') | rejectattr('instance', 'equalto', 'external') | map(attribute='name') | list }}"