summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-09-21 13:35:50 +0200
committerGitHub <noreply@github.com>2018-09-21 13:35:50 +0200
commit2036efadec53726af2f474e0cd5945f507a0fa57 (patch)
treee07c5b59f068bac36217dbbb024e20b354013056 /src
parentbe7c7d12ec29f69c5531ec431d7b45db622636da (diff)
parentf721e663fe1c24caa00a89f82865498bdf9473df (diff)
downloadvyos-1x-2036efadec53726af2f474e0cd5945f507a0fa57.tar.gz
vyos-1x-2036efadec53726af2f474e0cd5945f507a0fa57.zip
Merge pull request #47 from Watcher7/current
Bring VRRP configuration in line with keepalived config documentation.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/vrrp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py
index 28633f1b4..0480a886a 100755
--- a/src/conf_mode/vrrp.py
+++ b/src/conf_mode/vrrp.py
@@ -183,7 +183,7 @@ def get_config():
if not group["priority"]:
group["priority"] = 100
if not group["preempt_delay"]:
- group["preempt_delay"] = 5 * 60
+ group["preempt_delay"] = 0
if not group["health_check_interval"]:
group["health_check_interval"] = 60
if not group["health_check_count"]: