From 56a762fc6c217870a5c54bc0e4e162dfa0a1e9bf Mon Sep 17 00:00:00 2001 From: fett0 Date: Tue, 11 Apr 2023 18:30:02 +0000 Subject: T4939: backport VRRP startup delay --- data/templates/vrrp/keepalived.conf.tmpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data/templates') diff --git a/data/templates/vrrp/keepalived.conf.tmpl b/data/templates/vrrp/keepalived.conf.tmpl index 10d5c6d24..49c5c3916 100644 --- a/data/templates/vrrp/keepalived.conf.tmpl +++ b/data/templates/vrrp/keepalived.conf.tmpl @@ -5,6 +5,9 @@ global_defs { dynamic_interfaces script_user root +{% if vrrp.global_parameters.startup_delay is vyos_defined %} + vrrp_startup_delay {{ vrrp.global_parameters.startup_delay }} +{% endif %} notify_fifo /run/keepalived/keepalived_notify_fifo notify_fifo_script /usr/libexec/vyos/system/keepalived-fifo.py } -- cgit v1.2.3 From 930a2276811d65d25b543176d224f2178f0c0bd5 Mon Sep 17 00:00:00 2001 From: fett0 Date: Wed, 12 Apr 2023 01:28:27 +0000 Subject: T4939: fixed template VRRP startup delay --- data/templates/vrrp/keepalived.conf.tmpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/templates') diff --git a/data/templates/vrrp/keepalived.conf.tmpl b/data/templates/vrrp/keepalived.conf.tmpl index 49c5c3916..6203184e3 100644 --- a/data/templates/vrrp/keepalived.conf.tmpl +++ b/data/templates/vrrp/keepalived.conf.tmpl @@ -5,8 +5,10 @@ global_defs { dynamic_interfaces script_user root -{% if vrrp.global_parameters.startup_delay is vyos_defined %} - vrrp_startup_delay {{ vrrp.global_parameters.startup_delay }} +{% if global_parameters is defined and global_parameters is not none %} +{% if global_parameters.startup_delay is defined %} + vrrp_startup_delay {{ global_parameters.startup_delay }} +{% endif %} {% endif %} notify_fifo /run/keepalived/keepalived_notify_fifo notify_fifo_script /usr/libexec/vyos/system/keepalived-fifo.py -- cgit v1.2.3