Skip to content

Commit

Permalink
[dhcp_relay] Remove wait LLA in wati_for_intf.sh in dhcp_relay container
Browse files Browse the repository at this point in the history
  • Loading branch information
yaqiangz committed Dec 16, 2024
1 parent 8063384 commit 5e7e0f2
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions dockers/docker-dhcp-relay/wait_for_intf.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,6 @@ function wait_until_iface_ready
echo "Interface ${IFACE_NAME} is ready!"
}

function check_for_ipv6_link_local
{
IFACE_NAME=$1
echo "Waiting until interface ${IFACE_NAME} has a link-local ipv6 address configured...."

# Status of link local address is not populated in STATE_DB
while true; do
HAS_LL=$(ip -6 addr show ${IFACE_NAME} scope link 2> /dev/null)
RC=$?
if [[ ${RC} == "0" ]] && [[ ! -z ${HAS_LL} ]]; then
break
fi

sleep 1
done

echo "Link-Local address is configured on ${IFACE_NAME}"
}

# Wait for all interfaces with IPv4 addresses to be up and ready
# dhcp6relay binds to ipv6 addresses configured on these vlan ifaces
# Thus check if they are ready before launching dhcp6relay
Expand All @@ -55,7 +36,6 @@ wait_until_iface_ready {{ name }} {{ prefix }}
{% if prefix | ipv6 %}
{% if DHCP_RELAY and name in DHCP_RELAY %}
wait_until_iface_ready {{ name }} {{ prefix }}
check_for_ipv6_link_local {{ name }}
{% endif %}
{% endif %}
{% endfor %}
Expand Down

0 comments on commit 5e7e0f2

Please sign in to comment.