Skip to content

Commit

Permalink
Bug 2068301: Upon modifyin DNS entry in DHCP server - SNO OCP platfor…
Browse files Browse the repository at this point in the history
…m does not update resolv.conf (openshift#3717)

Changing force dns script for sno , now it will recreate resolv.conf
every network manager restart
  • Loading branch information
tsorya authored Apr 27, 2022
1 parent b31fbf3 commit d3f6c41
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions internal/network/manifests_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,13 @@ const forceDnsDispatcherScript = `
export IP="{{.HOST_IP}}"
export BASE_RESOLV_CONF=/run/NetworkManager/resolv.conf
if [ "$2" = "dhcp4-change" ] || [ "$2" = "dhcp6-change" ] || [ "$2" = "up" ] || [ "$2" = "connectivity-change" ]; then
if ! grep -q "$IP" /etc/resolv.conf; then
export TMP_FILE=$(mktemp /etc/forcedns_resolv.conf.XXXXXX)
cp $BASE_RESOLV_CONF $TMP_FILE
chmod --reference=$BASE_RESOLV_CONF $TMP_FILE
sed -i -e "s/{{.CLUSTER_NAME}}.{{.DNS_DOMAIN}}//" \
-e "s/search /& {{.CLUSTER_NAME}}.{{.DNS_DOMAIN}} /" \
-e "0,/nameserver/s/nameserver/& $IP\n&/" $TMP_FILE
mv $TMP_FILE /etc/resolv.conf
fi
export TMP_FILE=$(mktemp /etc/forcedns_resolv.conf.XXXXXX)
cp $BASE_RESOLV_CONF $TMP_FILE
chmod --reference=$BASE_RESOLV_CONF $TMP_FILE
sed -i -e "s/{{.CLUSTER_NAME}}.{{.DNS_DOMAIN}}//" \
-e "s/search /& {{.CLUSTER_NAME}}.{{.DNS_DOMAIN}} /" \
-e "0,/nameserver/s/nameserver/& $IP\n&/" $TMP_FILE
mv $TMP_FILE /etc/resolv.conf
fi
`

Expand Down

0 comments on commit d3f6c41

Please sign in to comment.