summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-09-12 08:07:08 +0200
committerGitHub <noreply@github.com>2022-09-12 08:07:08 +0200
commitd2338b7f5b09d06d7e7f206ff7ddcf7edc6eaa0f (patch)
treed64f2c96328832d173b570d0b73369b7bcfa7f48 /data/templates
parent84ee78e524713d98a01212ae0b7c58fcbc36382b (diff)
parent803f1bdc4ae13f3becb4dfe1a7831905152d6c10 (diff)
downloadvyos-1x-d2338b7f5b09d06d7e7f206ff7ddcf7edc6eaa0f.tar.gz
vyos-1x-d2338b7f5b09d06d7e7f206ff7ddcf7edc6eaa0f.zip
Merge pull request #1526 from roedie/T4665-2
T4665: Keepalived: Fix interface names
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/high-availability/keepalived.conf.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/high-availability/keepalived.conf.j2 b/data/templates/high-availability/keepalived.conf.j2
index 6684dbc2c..706e1c5ae 100644
--- a/data/templates/high-availability/keepalived.conf.j2
+++ b/data/templates/high-availability/keepalived.conf.j2
@@ -47,10 +47,10 @@ vrrp_instance {{ name }} {
{% endif %}
{% endif %}
{% if group_config.rfc3768_compatibility is vyos_defined and group_config.peer_address is vyos_defined %}
- use_vmac {{ group_config.interface }}v{{ group_config.vrid }}
+ use_vmac {{ group_config.interface }}v{{ group_config.vrid }}v{{ '4' if group_config['address'] | first | is_ipv4 else '6' }}
vmac_xmit_base
{% elif group_config.rfc3768_compatibility is vyos_defined %}
- use_vmac {{ group_config.interface }}v{{ group_config.vrid }}
+ use_vmac {{ group_config.interface }}v{{ group_config.vrid }}v{{ '4' if group_config['address'] | first | is_ipv4 else '6' }}
{% endif %}
{% if group_config.authentication is vyos_defined %}
authentication {