summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNataliia Solomko <natalirs1985@gmail.com>2024-02-28 11:42:58 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-02-29 10:49:46 +0000
commit39a90834bad17b10e9ad5321554e6e1ceb4c9c26 (patch)
tree7708e3fa977d494c9cd7382549aa42347e3e7beb /src
parentbeb120958f0a6556db30a2aaf8dcd997506b2035 (diff)
downloadvyos-1x-39a90834bad17b10e9ad5321554e6e1ceb4c9c26.tar.gz
vyos-1x-39a90834bad17b10e9ad5321554e6e1ceb4c9c26.zip
T5504 Keepalived VRRP ability to set more than one peer-address
(cherry picked from commit 3480d92a8c4d84e8c1f94a9362bac2be0cc77921)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/high-availability.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/conf_mode/high-availability.py b/src/conf_mode/high-availability.py
index b3b27b14e..59d49ea67 100755
--- a/src/conf_mode/high-availability.py
+++ b/src/conf_mode/high-availability.py
@@ -125,8 +125,9 @@ def verify(ha):
raise ConfigError(f'VRRP group "{group}" uses IPv4 but hello-source-address is IPv6!')
if 'peer_address' in group_config:
- if is_ipv6(group_config['peer_address']):
- raise ConfigError(f'VRRP group "{group}" uses IPv4 but peer-address is IPv6!')
+ for peer_address in group_config['peer_address']:
+ if is_ipv6(peer_address):
+ raise ConfigError(f'VRRP group "{group}" uses IPv4 but peer-address is IPv6!')
if vaddrs6:
tmp = {'interface': interface, 'vrid': vrid, 'ipver': 'IPv6'}
@@ -139,8 +140,9 @@ def verify(ha):
raise ConfigError(f'VRRP group "{group}" uses IPv6 but hello-source-address is IPv4!')
if 'peer_address' in group_config:
- if is_ipv4(group_config['peer_address']):
- raise ConfigError(f'VRRP group "{group}" uses IPv6 but peer-address is IPv4!')
+ for peer_address in group_config['peer_address']:
+ if is_ipv4(peer_address):
+ raise ConfigError(f'VRRP group "{group}" uses IPv6 but peer-address is IPv4!')
# Check sync groups
if 'vrrp' in ha and 'sync_group' in ha['vrrp']:
for sync_group, sync_config in ha['vrrp']['sync_group'].items():