diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-03-28 18:18:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 18:18:19 +0100 |
| commit | 82001265750fec18bab13161734ff1a90d2f7fc3 (patch) | |
| tree | 184b8db526fa2e465a20266672049e48a4cd13e3 | |
| parent | d15db95d96ead981600140614797b08f9ff3f2f6 (diff) | |
| parent | 0daf445abcd00446da21fe0220d41d5fdde95ebd (diff) | |
| download | vyos-1x-82001265750fec18bab13161734ff1a90d2f7fc3.tar.gz vyos-1x-82001265750fec18bab13161734ff1a90d2f7fc3.zip | |
Merge pull request #3200 from sever-sever/T5832
T5832: VRRP allow set interface for exluded-address
| -rw-r--r-- | data/templates/high-availability/keepalived.conf.j2 | 4 | ||||
| -rw-r--r-- | interface-definitions/high-availability.xml.in | 23 |
2 files changed, 18 insertions, 9 deletions
diff --git a/data/templates/high-availability/keepalived.conf.j2 b/data/templates/high-availability/keepalived.conf.j2 index 240161748..c0d66ae54 100644 --- a/data/templates/high-availability/keepalived.conf.j2 +++ b/data/templates/high-availability/keepalived.conf.j2 @@ -138,8 +138,8 @@ vrrp_instance {{ name }} { {% endif %} {% if group_config.excluded_address is vyos_defined %} virtual_ipaddress_excluded { -{% for addr in group_config.excluded_address %} - {{ addr }} +{% for addr, addr_config in group_config.excluded_address.items() %} + {{ addr }}{{ ' dev ' + addr_config.interface if addr_config.interface is vyos_defined }} {% endfor %} } {% endif %} diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in index 558404882..7108aa06c 100644 --- a/interface-definitions/high-availability.xml.in +++ b/interface-definitions/high-availability.xml.in @@ -294,25 +294,34 @@ #include <include/generic-interface-broadcast.xml.i> </children> </tagNode> - <leafNode name="excluded-address"> + <tagNode name="excluded-address"> <properties> <help>Virtual address (If you need additional IPv4 and IPv6 in same group)</help> <valueHelp> + <format>ipv4net</format> + <description>IPv4 address and prefix length</description> + </valueHelp> + <valueHelp> + <format>ipv6net</format> + <description>IPv6 address and prefix length</description> + </valueHelp> + <valueHelp> <format>ipv4</format> - <description>IP address</description> + <description>IPv4 address</description> </valueHelp> <valueHelp> <format>ipv6</format> <description>IPv6 address</description> </valueHelp> - <multi/> <constraint> - <validator name="ipv4-host"/> - <validator name="ipv6-host"/> + <validator name="ip-host"/> + <validator name="ip-address"/> </constraint> - <constraintErrorMessage>Virtual address must be a valid IPv4 or IPv6 address with prefix length (e.g. 192.0.2.3/24 or 2001:db8:ff::10/64)</constraintErrorMessage> </properties> - </leafNode> + <children> + #include <include/generic-interface-broadcast.xml.i> + </children> + </tagNode> <leafNode name="vrid"> <properties> <help>Virtual router identifier</help> |