Skip to content

[release-4.16] OCPBUGS-55807: update resolv.conf every time on bootstrap node #9694

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

Open
wants to merge 2 commits into
base: release-4.16
Choose a base branch
from
Open

[release-4.16] OCPBUGS-55807: update resolv.conf every time on bootstrap node #9694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ac492c
OCPBUGS-32792: update resolv.conf every tiem on bootstrap
yatanaka-1007 May 20, 2024
8790d5e
OCPBUGS-32792: update resolv.conf every tiem on bootstrap
yatanaka-1007 Jul 3, 2024
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
14 changes: 7 additions & 7 deletions ...bootstrap/baremetal/files/etc/NetworkManager/dispatcher.d/30-local-dns-prepender.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
IFACE=$1
STATUS=$2
case "$STATUS" in
up|dhcp4-change|dhcp6-change)
up|dhcp4-change|dhcp6-change|dns-change)
logger -s "NM local-dns-prepender triggered by ${1} ${2}."

# In DHCP connections, the resolv.conf content may be late, thus we wait for nameservers
Expand Down Expand Up @@ -33,14 +33,14 @@ EOF
fi
fi
else
logger -s "NM local-dns-prepender: Checking if local DNS IP is the first entry in resolv.conf"
if grep nameserver /etc/resolv.conf | head -n 1 | grep -q "$DNS_IP" ; then
logger -s "NM local-dns-prepender: local DNS IP already is the first entry in resolv.conf"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
if cmp -s /etc/resolv.tmp /etc/resolv.conf; then
logger -s "NM local-dns-prepender: /etc/resolv.conf is already up to date"
rm -f /etc/resolv.tmp
exit 0
else
logger -s "NM local-dns-prepender: Looking for '# Generated by NetworkManager' in /etc/resolv.conf to place 'nameserver $DNS_IP'"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
logger -s "NM local-dns-prepender: overwriting /etc/resolv.conf to add local DNS IP and DNS servers obtained by DHCP"
mv -f /etc/resolv.tmp /etc/resolv.conf
fi
fi
Expand Down
14 changes: 7 additions & 7 deletions data/data/bootstrap/nutanix/files/etc/NetworkManager/dispatcher.d/30-local-dns-prepender
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
IFACE=$1
STATUS=$2
case "$STATUS" in
up|dhcp4-change|dhcp6-change)
up|dhcp4-change|dhcp6-change|dns-change)
logger -s "NM local-dns-prepender triggered by ${1} ${2}."

# In DHCP connections, the resolv.conf content may be late, thus we wait for nameservers
Expand Down Expand Up @@ -31,14 +31,14 @@ EOF
fi
fi
else
logger -s "NM local-dns-prepender: Checking if local DNS IP is the first entry in resolv.conf"
if grep nameserver /etc/resolv.conf | head -n 1 | grep -q "$DNS_IP" ; then
logger -s "NM local-dns-prepender: local DNS IP already is the first entry in resolv.conf"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
if cmp -s /etc/resolv.tmp /etc/resolv.conf; then
logger -s "NM local-dns-prepender: /etc/resolv.conf is already up to date"
rm -f /etc/resolv.tmp
exit 0
else
logger -s "NM local-dns-prepender: Looking for '# Generated by NetworkManager' in /etc/resolv.conf to place 'nameserver $DNS_IP'"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
logger -s "NM local-dns-prepender: overwriting /etc/resolv.conf to add local DNS IP and DNS servers obtained by DHCP"
mv -f /etc/resolv.tmp /etc/resolv.conf
fi
fi
Expand Down
14 changes: 7 additions & 7 deletions data/data/bootstrap/openstack/files/etc/NetworkManager/dispatcher.d/30-local-dns-prepender
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
IFACE=$1
STATUS=$2
case "$STATUS" in
up|dhcp4-change|dhcp6-change)
up|dhcp4-change|dhcp6-change|dns-change)
logger -s "NM local-dns-prepender triggered by ${1} ${2}."

# In DHCP connections, the resolv.conf content may be late, thus we wait for nameservers
Expand Down Expand Up @@ -31,14 +31,14 @@ EOF
fi
fi
else
logger -s "NM local-dns-prepender: Checking if local DNS IP is the first entry in resolv.conf"
if grep nameserver /etc/resolv.conf | head -n 1 | grep -q "$DNS_IP" ; then
logger -s "NM local-dns-prepender: local DNS IP already is the first entry in resolv.conf"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
if cmp -s /etc/resolv.tmp /etc/resolv.conf; then
logger -s "NM local-dns-prepender: /etc/resolv.conf is already up to date"
rm -f /etc/resolv.tmp
exit 0
else
logger -s "NM local-dns-prepender: Looking for '# Generated by NetworkManager' in /etc/resolv.conf to place 'nameserver $DNS_IP'"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
logger -s "NM local-dns-prepender: overwriting /etc/resolv.conf to add local DNS IP and DNS servers obtained by DHCP"
mv -f /etc/resolv.tmp /etc/resolv.conf
fi
fi
Expand Down
14 changes: 7 additions & 7 deletions data/data/bootstrap/ovirt/files/etc/NetworkManager/dispatcher.d/30-local-dns-prepender
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
IFACE=$1
STATUS=$2
case "$STATUS" in
up|dhcp4-change|dhcp6-change)
up|dhcp4-change|dhcp6-change|dns-change)
logger -s "NM local-dns-prepender triggered by ${1} ${2}."

# In DHCP connections, the resolv.conf content may be late, thus we wait for nameservers
Expand Down Expand Up @@ -31,14 +31,14 @@ EOF
fi
fi
else
logger -s "NM local-dns-prepender: Checking if local DNS IP is the first entry in resolv.conf"
if grep nameserver /etc/resolv.conf | head -n 1 | grep -q "$DNS_IP" ; then
logger -s "NM local-dns-prepender: local DNS IP already is the first entry in resolv.conf"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
if cmp -s /etc/resolv.tmp /etc/resolv.conf; then
logger -s "NM local-dns-prepender: /etc/resolv.conf is already up to date"
rm -f /etc/resolv.tmp
exit 0
else
logger -s "NM local-dns-prepender: Looking for '# Generated by NetworkManager' in /etc/resolv.conf to place 'nameserver $DNS_IP'"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
logger -s "NM local-dns-prepender: overwriting /etc/resolv.conf to add local DNS IP and DNS servers obtained by DHCP"
mv -f /etc/resolv.tmp /etc/resolv.conf
fi
fi
Expand Down
14 changes: 7 additions & 7 deletions ...a/bootstrap/vsphere/files/etc/NetworkManager/dispatcher.d/30-local-dns-prepender.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
IFACE=$1
STATUS=$2
case "$STATUS" in
up|dhcp4-change|dhcp6-change)
up|dhcp4-change|dhcp6-change|dns-change)
{{if .PlatformData.VSphere.UserProvidedVIPs}}
logger -s "NM local-dns-prepender triggered by ${1} ${2}."
DNS_IP="127.0.0.1"
Expand Down Expand Up @@ -33,14 +33,14 @@ EOF
fi
fi
else
logger -s "NM local-dns-prepender: Checking if local DNS IP is the first entry in resolv.conf"
if grep nameserver /etc/resolv.conf | head -n 1 | grep -q "$DNS_IP" ; then
logger -s "NM local-dns-prepender: local DNS IP already is the first entry in resolv.conf"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
if cmp -s /etc/resolv.tmp /etc/resolv.conf; then
logger -s "NM local-dns-prepender: /etc/resolv.conf is already up to date"
rm -f /etc/resolv.tmp
exit 0
else
logger -s "NM local-dns-prepender: Looking for '# Generated by NetworkManager' in /etc/resolv.conf to place 'nameserver $DNS_IP'"
cp -f /var/run/NetworkManager/resolv.conf /etc/resolv.tmp
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.tmp
logger -s "NM local-dns-prepender: overwriting /etc/resolv.conf to add local DNS IP and DNS servers obtained by DHCP"
mv -f /etc/resolv.tmp /etc/resolv.conf
fi
fi
Expand Down