From 6585915fe7b0b7603b5cefbf268cb9146b8e542c Mon Sep 17 00:00:00 2001 From: jcaiMR Date: Fri, 7 Jul 2023 15:54:50 +0000 Subject: [PATCH 1/3] add loopback0 as source interface in dualtor --- dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 index 8f83e05efc7..e392711f532 100644 --- a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 +++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 @@ -13,7 +13,7 @@ [program:dhcp6relay] command=/usr/sbin/dhcp6relay {#- Dual ToR Option #} -{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -d{% endif %} +{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0 {% endif %} priority=3 autostart=false From 9cee2ecd016cee8d3a6463a7ff3857f291062cdc Mon Sep 17 00:00:00 2001 From: jcaiMR Date: Fri, 7 Jul 2023 16:08:40 +0000 Subject: [PATCH 2/3] add loopback0 as source interface in dual-tor --- dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 index 8f83e05efc7..e392711f532 100644 --- a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 +++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 @@ -13,7 +13,7 @@ [program:dhcp6relay] command=/usr/sbin/dhcp6relay {#- Dual ToR Option #} -{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -d{% endif %} +{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0 {% endif %} priority=3 autostart=false From 6ab75e0fbc6d3102f03a9ffbee44c0cfd5e8e99a Mon Sep 17 00:00:00 2001 From: jcaiMR Date: Tue, 11 Jul 2023 09:14:39 +0000 Subject: [PATCH 3/3] advance dhcprelay to 3578eb3 in 202012 --- src/dhcprelay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcprelay b/src/dhcprelay index a4b15d8ba42..3578eb33786 160000 --- a/src/dhcprelay +++ b/src/dhcprelay @@ -1 +1 @@ -Subproject commit a4b15d8ba429c2799d3927f8dca376745af08c1a +Subproject commit 3578eb337860fa98672655d4182d2df4ce2b3bfe