From 5422c2ac9af78e19a8721e9400f183c83d363b21 Mon Sep 17 00:00:00 2001 From: Danila Balagansky Date: Wed, 24 Aug 2022 13:34:55 +0300 Subject: [PATCH] Add keepalived_instances_overrides for customizing keepalived_instances Change-Id: Ic6be7519aa869badda0a471fcf6ab11ebc5cbe87 --- inventory/group_vars/haproxy/keepalived.yml | 4 +++- .../notes/keepalived_instance_params-35cbbbf66bbdefb7.yaml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/keepalived_instance_params-35cbbbf66bbdefb7.yaml diff --git a/inventory/group_vars/haproxy/keepalived.yml b/inventory/group_vars/haproxy/keepalived.yml index 61827e5428..64876586b9 100644 --- a/inventory/group_vars/haproxy/keepalived.yml +++ b/inventory/group_vars/haproxy/keepalived.yml @@ -53,7 +53,7 @@ keepalived_scripts: # priority: "{{ (groups['haproxy']|length-groups['haproxy'].index(inventory_hostname)*50 }}" # by # priority: "{{ (groups['haproxy'].index(inventory_hostname) == 0) | ternary('100','50') }}" -keepalived_instances: +_keepalived_default_instances: external: interface: "{{ haproxy_keepalived_external_interface | default(management_bridge) }}" state: "{{ (groups['haproxy'].index(inventory_hostname) == 0) | ternary('MASTER', 'BACKUP') }}" @@ -72,3 +72,5 @@ keepalived_instances: vips: - "{{ 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 }}" + +keepalived_instances: "{{ _keepalived_default_instances | combine(keepalived_instances_overrides | default({}), recursive=True) }}" diff --git a/releasenotes/notes/keepalived_instance_params-35cbbbf66bbdefb7.yaml b/releasenotes/notes/keepalived_instance_params-35cbbbf66bbdefb7.yaml new file mode 100644 index 0000000000..892024b9b0 --- /dev/null +++ b/releasenotes/notes/keepalived_instance_params-35cbbbf66bbdefb7.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Add ``keepalived_instances_overrides`` variable, which allows passing + custom options for ``keepalived_instances``.