openshift: use smarter logic to get coredns ip

karmab · Oct 23, 2024 · 1f6e394 · 1f6e394
1 parent 5914db5
commit 1f6e394
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/kvirt/cluster/openshift/99-forcedns b/kvirt/cluster/openshift/99-forcedns
@@ -7,7 +7,8 @@ fi
 
 if [ "$2" = "dhcp4-change" ] || [ "$2" = "dhcp6-change" ] || [ "$2" = "up" ] || [ "$2" = "connectivity-change" ]; then
   sleep 2
-  IP=$(/bin/hostname -I | awk '{print $1}')
+  NIC={{ "$(ip -6 r | grep -v lo | head -1 | grep -oP '(?<=dev )[^ ]*')" if ipv6 else "$(ip r | grep default | head -1 | grep -oP '(?<=dev )[^ ]*')" }}
+  IP={{ "$(ip -o -f inet6 addr show $NIC | head -1 | grep -oP '(?<=inet6 )[^ ]*' | cut -d '/' -f 1)" if ipv6 else "$(ip -o -f inet addr show $NIC | head -1 | grep -oP '(?<=inet )[^ ]*' | cut -d '/' -f 1)" }}
   if [ "$IP" != "" ] ; then
     grep -q $IP /etc/resolv.conf
     if [ "$?" != "0" ] ; then

diff --git a/kvirt/providers/kvm/__init__.py b/kvirt/providers/kvm/__init__.py
@@ -686,7 +686,7 @@ def create(self, name, virttype=None, profile='kvirt', flavor=None, plan='kvirt'
                     nic = nets[index].get('nic', 'ens3')
                     if needs_ignition and ip is not None and netmask is not None and gateway is not None:
                         nameservers = [nameserver] if isinstance(nameserver, str) else nameserver
-                        nameservers = ' '.join([f"nameserver={nameserver}" for name in nameservers])
+                        nameservers = ' '.join([f"nameserver={name}" for name in nameservers])
                         warning("Injecting static networking via cmdline")
                         cmdline = f'ip={ip}::{gateway}:{netmask}::{nic}:none {nameservers}'
                         del nets[index]['ip']