diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-09-21 13:35:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 13:35:50 +0200 |
| commit | 2036efadec53726af2f474e0cd5945f507a0fa57 (patch) | |
| tree | e07c5b59f068bac36217dbbb024e20b354013056 | |
| parent | be7c7d12ec29f69c5531ec431d7b45db622636da (diff) | |
| parent | f721e663fe1c24caa00a89f82865498bdf9473df (diff) | |
| download | vyos-1x-2036efadec53726af2f474e0cd5945f507a0fa57.tar.gz vyos-1x-2036efadec53726af2f474e0cd5945f507a0fa57.zip | |
Merge pull request #47 from Watcher7/current
Bring VRRP configuration in line with keepalived config documentation.
| -rw-r--r-- | interface-definitions/vrrp.xml | 2 | ||||
| -rwxr-xr-x | src/conf_mode/vrrp.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/interface-definitions/vrrp.xml b/interface-definitions/vrrp.xml index 72419efe9..2884ef613 100644 --- a/interface-definitions/vrrp.xml +++ b/interface-definitions/vrrp.xml @@ -146,7 +146,7 @@ <properties> <help>Preempt delay (in seconds)</help> <constraint> - <validator name="numeric" argument="--positive"/> + <validator name="numeric" argument="--range 0-1000"/> </constraint> </properties> </leafNode> 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"]: |