summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2022-02-17 09:22:38 -0500
committerGitHub <noreply@github.com>2022-02-17 09:22:38 -0500
commitb14e91cb5547c8e3b9cc511aeb71d189f56cd55d (patch)
tree9bbb418f5740b0f62f7024fec369a3f98297df12 /data/templates
parent267818cb247f66dce4509b8e187a0ead7f1bcd97 (diff)
parentb99432ee2dc84a1d8cef59ef534392867d10de1e (diff)
downloadvyos-1x-b14e91cb5547c8e3b9cc511aeb71d189f56cd55d.tar.gz
vyos-1x-b14e91cb5547c8e3b9cc511aeb71d189f56cd55d.zip
Merge pull request #1224 from sever-sever/T1972-equ
vrrp: T1972: Ability to set IP address on not vrrp interface
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/vrrp/keepalived.conf.tmpl14
1 files changed, 12 insertions, 2 deletions
diff --git a/data/templates/vrrp/keepalived.conf.tmpl b/data/templates/vrrp/keepalived.conf.tmpl
index afbdc978e..10d5c6d24 100644
--- a/data/templates/vrrp/keepalived.conf.tmpl
+++ b/data/templates/vrrp/keepalived.conf.tmpl
@@ -28,6 +28,9 @@ vrrp_instance {{ name }} {
virtual_router_id {{ group_config.vrid }}
priority {{ group_config.priority }}
advert_int {{ group_config.advertise_interval }}
+{% if group_config.track is defined and group_config.track.exclude_vrrp_interface is defined %}
+ dont_track_primary
+{% endif %}
{% if group_config.no_preempt is not defined and group_config.preempt_delay is defined and group_config.preempt_delay is not none %}
preempt_delay {{ group_config.preempt_delay }}
{% elif group_config.no_preempt is defined %}
@@ -61,8 +64,8 @@ vrrp_instance {{ name }} {
{% endif %}
{% if group_config.virtual_address is defined and group_config.virtual_address is not none %}
virtual_ipaddress {
-{% for addr in group_config.virtual_address %}
- {{ addr }}
+{% for addr, addr_config in group_config.virtual_address.items() %}
+ {{ addr }}{{ ' dev ' + addr_config.interface if addr_config.interface is defined }}
{% endfor %}
}
{% endif %}
@@ -73,6 +76,13 @@ vrrp_instance {{ name }} {
{% endfor %}
}
{% endif %}
+{% if group_config.track is defined and group_config.track.interface is defined and group_config.track.interface is not none %}
+ track_interface {
+{% for interface in group_config.track.interface %}
+ {{ interface }}
+{% endfor %}
+ }
+{% endif %}
{% if group_config.health_check is defined and group_config.health_check.script is defined and group_config.health_check.script is not none %}
track_script {
healthcheck_{{ name }}