Bug 2068301: Upon modifyin DNS entry in DHCP server - SNO OCP platfor…

…m does not update resolv.conf Changing force dns script for sno , now it will recreate resolv.conf every network manager restart (#3753) Co-authored-by: Igal Tsoiref <itsoiref@redhat.com>
openshift · May 3, 2022 · 0356f7e · 0356f7e
1 parent 495c1c6
commit 0356f7e
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/internal/network/manifests_generator.go b/internal/network/manifests_generator.go
@@ -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
 `