Bug 1794699: [release-4.3] baremetal: ipv6, switch to NM dispatcher for DNS VIP prepending

templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml

@@ -5,3 +5,4 @@ contents:
   inline: |
     [main]
     dhcp=dhclient
+    rc-manager=unmanaged

templates/master/00-master/baremetal/files/NetworkManager-resolv-prepender.yaml

@@ -0,0 +1,24 @@
+filesystem: "root"
+mode: 0755
+path: "/etc/NetworkManager/dispatcher.d/30-resolv-prepender"
+contents:
+  inline: |
+    #!/bin/bash
+    IFACE=$1
+    STATUS=$2
+    case "$STATUS" in
+        up|down|dhcp4-change|dhcp6-change)
+        logger -s "NM resolv-prepender triggered by ${1} ${2}."
+        NAMESERVER_IP="{{.Infra.Status.PlatformStatus.BareMetal.NodeDNSIP}}"
+        set +e
+        if [[ -n "$NAMESERVER_IP" ]]; then
+            logger -s "NM resolv-prepender: Prepending 'nameserver $NAMESERVER_IP' to /etc/resolv.conf (other nameservers from /var/run/NetworkManager/resolv.conf)"
+            sed "/^search .*$/a nameserver $NAMESERVER_IP" /var/run/NetworkManager/resolv.conf > /etc/resolv.conf
+        else
+            logger -s "NM resolv-prepender: Couldn't find a Virtual IP, just updating resolv.conf"
+            cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
+        fi
+        ;;
+        *)
+        ;;
+    esac

templates/master/00-master/baremetal/files/dhcp-dhclient-conf.yaml

@@ -4,4 +4,3 @@ path: "/etc/dhcp/dhclient.conf"
 contents:
   inline: |
     supersede domain-search "{{ .EtcdDiscoveryDomain }}";
-    prepend domain-name-servers {{ .Infra.Status.PlatformStatus.BareMetal.NodeDNSIP }};

templates/worker/00-worker/baremetal/files/NetworkManager-resolv-prepender.yaml

@@ -0,0 +1,27 @@
+filesystem: "root"
+mode: 0755
+path: "/etc/NetworkManager/dispatcher.d/30-resolv-prepender"
+contents:
+  inline: |
+    #!/bin/bash
+    IFACE=$1
+    STATUS=$2
+    case "$STATUS" in
+        up|down|dhcp4-change|dhcp6-change)
+        logger -s "NM resolv-prepender triggered by ${1} ${2}."
+        NAMESERVER_IP=$(/usr/local/bin/non_virtual_ip \
+            "{{.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP}}" \
+            "{{.Infra.Status.PlatformStatus.BareMetal.NodeDNSIP}}" \
+            "{{.Infra.Status.PlatformStatus.BareMetal.IngressIP}}")
+        set +e
+        if [[ -n "$NAMESERVER_IP" ]]; then
+            logger -s "NM resolv-prepender: Prepending 'nameserver $NAMESERVER_IP' to /etc/resolv.conf (other nameservers from /var/run/NetworkManager/resolv.conf)"
+            sed "/^search .*$/a nameserver $NAMESERVER_IP" /var/run/NetworkManager/resolv.conf > /etc/resolv.conf
+        else
+            logger -s "Couldn't find a non-virtual IP, just updating resolv.conf"
+            cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
+        fi
+        ;;
+        *)
+        ;;
+    esac

templates/worker/00-worker/baremetal/files/dhcp-dhclient-conf.yaml

@@ -4,4 +4,3 @@ path: "/etc/dhcp/dhclient.conf.template"
 contents:
   inline: |
     supersede domain-search "{{ .EtcdDiscoveryDomain }}";
-    prepend domain-name-servers {{`{{ .NonVirtualIP }}`}};