From ca70102fcf782e7a61d3d1b7672d74eb8db32129 Mon Sep 17 00:00:00 2001 From: Nicolas Fort Date: Tue, 18 Oct 2022 11:41:45 +0000 Subject: T2408: dhcp-relay: Add listen-interface and upstream-interface feature --- data/templates/dhcp-relay/dhcrelay.conf.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'data/templates') diff --git a/data/templates/dhcp-relay/dhcrelay.conf.j2 b/data/templates/dhcp-relay/dhcrelay.conf.j2 index 11710bd8e..c26c263fd 100644 --- a/data/templates/dhcp-relay/dhcrelay.conf.j2 +++ b/data/templates/dhcp-relay/dhcrelay.conf.j2 @@ -2,5 +2,8 @@ {% set max_size = '-A ' ~ relay_options.max_size if relay_options.max_size is vyos_defined %} {# hop_count and relay_agents_packets is a default option, thus it is always present #} +{% if interface is vyos_defined %} OPTIONS="-c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -i {{ interface | join(' -i ') }} {{ server | join(' ') }}" - +{% else %} +OPTIONS="-c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -id {{ listen_interface | join(' -id ') }} -iu {{ upstream_interface | join(' -iu ') }} {{ server | join(' ') }}" +{% endif %} \ No newline at end of file -- cgit v1.2.3