From 3c8ae454b424d937183ccdadf509cb4f0cd79bfc Mon Sep 17 00:00:00 2001 From: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Date: Tue, 25 Jul 2023 09:28:16 +0800 Subject: [PATCH] [202012] dhcprelay add Loopback0 as source interface in dualtor scenario (#15744) #### Why I did it 1. sonic-build image side change to fix source interface selection in dual tor scenario. dhcprelay related PR: https://github.com/sonic-net/sonic-dhcp-relay/pull/40 2. Announce dhcprelay submodule to 3578eb3 (to invoke [#40](https://github.com/sonic-net/sonic-dhcp-relay/pull/40 ) PR) ##### Work item tracking - Microsoft ADO 24243215 #### How to verify it run test case, dhcp_relay/test_dhcpv6_relay.py --- dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 | 2 +- src/dhcprelay | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 index 8f83e05efc7c..e392711f5326 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 diff --git a/src/dhcprelay b/src/dhcprelay index a4b15d8ba429..3578eb337860 160000 --- a/src/dhcprelay +++ b/src/dhcprelay @@ -1 +1 @@ -Subproject commit a4b15d8ba429c2799d3927f8dca376745af08c1a +Subproject commit 3578eb337860fa98672655d4182d2df4ce2b3bfe