summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-01-25 14:26:26 +0100
committerGitHub <noreply@github.com>2023-01-25 14:26:26 +0100
commitcf128449bac7f753d7853636758a74f370490ff3 (patch)
tree185220694aba68d41cbf27a1b0dd82f0f29d6c90 /src/conf_mode
parent2e607d43c5acc3521a41e0155f8571aa42d14cdc (diff)
parent144b6e6e7b6230283ad8eccc374c443bffd74c3f (diff)
downloadvyos-1x-cf128449bac7f753d7853636758a74f370490ff3.tar.gz
vyos-1x-cf128449bac7f753d7853636758a74f370490ff3.zip
Merge pull request #1777 from nicolas-fort/T1297-garp
T1297: VRRP: add garp options to vrrp
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/high-availability.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/conf_mode/high-availability.py b/src/conf_mode/high-availability.py
index 4ed16d0d7..bc3e67b40 100755
--- a/src/conf_mode/high-availability.py
+++ b/src/conf_mode/high-availability.py
@@ -51,6 +51,8 @@ def get_config(config=None):
if 'vrrp' in ha:
if 'group' in ha['vrrp']:
default_values_vrrp = defaults(base_vrrp + ['group'])
+ if 'garp' in default_values_vrrp:
+ del default_values_vrrp['garp']
for group in ha['vrrp']['group']:
ha['vrrp']['group'][group] = dict_merge(default_values_vrrp, ha['vrrp']['group'][group])