diff options
| author | Daniil Baturin <daniil@baturin.org> | 2021-02-11 07:22:46 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2021-02-11 08:24:50 +0200 |
| commit | 51dc9eb8c0692fe68223538e634bdbd25363a862 (patch) | |
| tree | 725e28bc7236e6317cd52f96865588b5004a2fea | |
| parent | ee8f20596ba1b0482b5e9ccc7826baae294dbde5 (diff) | |
| download | vyos-1x-51dc9eb8c0692fe68223538e634bdbd25363a862.tar.gz vyos-1x-51dc9eb8c0692fe68223538e634bdbd25363a862.zip | |
T3248: add the missing mode-force option, just a dummy for issuing deprecation warnings.
| -rw-r--r-- | interface-definitions/vrrp.xml.in | 9 | ||||
| -rwxr-xr-x | src/conf_mode/vrrp.py | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in index caa9f4a33..3c4c9b83c 100644 --- a/interface-definitions/vrrp.xml.in +++ b/interface-definitions/vrrp.xml.in @@ -212,6 +212,15 @@ </constraint> </properties> </leafNode> + <leafNode name="mode-force"> + <properties> + <valueless/> + <help>Disable VRRP state checking (deprecated, will be removed in VyOS 1.4)</help> + <constraint> + <validator name="script"/> + </constraint> + </properties> + </leafNode> </children> </node> <leafNode name="virtual-address"> diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py index 4510dd3e7..680a80859 100755 --- a/src/conf_mode/vrrp.py +++ b/src/conf_mode/vrrp.py @@ -75,6 +75,7 @@ def get_config(config=None): group["backup_script"] = config.return_value("transition-script backup") group["fault_script"] = config.return_value("transition-script fault") group["stop_script"] = config.return_value("transition-script stop") + group["script_mode_force"] = config.exists("transition-script mode-force") if config.exists("no-preempt"): group["preempt"] = False @@ -183,6 +184,11 @@ def verify(data): if isinstance(pa, IPv4Address): raise ConfigError("VRRP group {0} uses IPv6 but its peer-address is IPv4".format(group["name"])) + # Warn the user about the deprecated mode-force option + if group['script_mode_force']: + print("""Warning: "transition-script mode-force" VRRP option is deprecated and will be removed in VyOS 1.4.""") + print("""It's no longer necessary, so you can safely remove it from your config now.""") + # Disallow same VRID on multiple interfaces _groups = sorted(vrrp_groups, key=(lambda x: x["interface"])) count = len(_groups) - 1 |