Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[dns] Do not apply dynamic DNS configuration when MGMT interface has static IP address. #17769

Merged
merged 1 commit into from
Jan 24, 2024
Merged

[dns] Do not apply dynamic DNS configuration when MGMT interface has static IP address. #17769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions files/image_config/resolv-config/resolv-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,24 @@ start()
{
update_symlink

redis-dump -d 4 -k "DNS_NAMESERVER*" -y > /tmp/dns.json
if [[ $? -eq 0 && "$(cat /tmp/dns.json)" != "{}" ]]; then
has_static_mgmt_ip=false
mgmt_ip_cfg=$(redis-dump -d 4 -k "MGMT_INTERFACE|eth0|*" -y)
if [[ $? -eq 0 && ${mgmt_ip_cfg} != "{}" ]]; then
has_static_mgmt_ip=true
fi

has_static_dns=false
dns_cfg=$(redis-dump -d 4 -k "DNS_NAMESERVER*" -y)
if [[ $? -eq 0 && ${dns_cfg} != "{}" ]]; then
has_static_dns=true
fi

if [[ ${has_static_mgmt_ip} == true || ${has_static_dns} == true ]]; then
# Apply static DNS configuration and disable updates
/sbin/resolvconf --disable-updates
pushd ${CONFIG_DIR}
# Backup dynamic configuration to restore it when the static configuration is removed
mv ${DYNAMIC_CONFIG_FILE_TEMPLATE} ${WD} || true
mv ${DYNAMIC_CONFIG_FILE_TEMPLATE} ${WD} 2>/dev/null || true

sonic-cfggen -d -t /usr/share/sonic/templates/resolv.conf.j2,${STATIC_CONFIG_FILE}

Expand All @@ -34,7 +45,7 @@ start()
pushd ${CONFIG_DIR}
rm -f ${STATIC_CONFIG_FILE}
# Restore dynamic configuration if it exists
mv ${WD}/${DYNAMIC_CONFIG_FILE_TEMPLATE} ${CONFIG_DIR} || true
mv ${WD}/${DYNAMIC_CONFIG_FILE_TEMPLATE} ${CONFIG_DIR} 2>/dev/null || true

/sbin/resolvconf --enable-updates
/sbin/resolvconf -u
Expand Down
Loading