From 540ae7e486054bf22e10716afbcc48192f26cdd9 Mon Sep 17 00:00:00 2001
From: juvdiaz <juvenal.diaz@oracle.com>
Date: Thu, 2 Jul 2026 10:26:19 -0600
Subject: [PATCH] Fixing pimox worker having 2 ips

---
 bootstrap/cluster/main.tf |  1 +
 jeannie                   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bootstrap/cluster/main.tf b/bootstrap/cluster/main.tf
index f647d7e..4500db0 100644
--- a/bootstrap/cluster/main.tf
+++ b/bootstrap/cluster/main.tf
@@ -436,6 +436,7 @@ resource "null_resource" "kubeadm_worker" {
     user        = self.triggers.user
     private_key = file(self.triggers.ssh_key_path)
     host        = self.triggers.host
+    timeout     = "15m"
   }
 
   provisioner "remote-exec" {
diff --git a/jeannie b/jeannie
index 3897d4f..4a0f30d 100755
--- a/jeannie
+++ b/jeannie
@@ -1476,13 +1476,20 @@ iface ${interface_name} inet static
   dns-nameservers ${dns_servers}
 INTERFACES
 sudo cp /tmp/homelab-interfaces /etc/network/interfaces
-sudo systemctl disable --now systemd-networkd NetworkManager 2>/dev/null || true
+sudo mkdir -p /etc/cloud/cloud.cfg.d
+printf '%s\n' 'network: {config: disabled}' | sudo tee /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg >/dev/null
+for unit in systemd-networkd systemd-networkd.socket NetworkManager dhcpcd; do
+  sudo systemctl disable --now "\$unit" >/dev/null 2>&1 || true
+done
+sudo pkill -x dhclient >/dev/null 2>&1 || true
+sudo pkill -x dhcpcd >/dev/null 2>&1 || true
 sudo systemctl enable networking >/dev/null 2>&1 || true
 sudo ifdown --force ${interface_name} 2>/dev/null || true
-sudo ip addr flush dev ${interface_name} || true
+sudo ip addr flush dev ${interface_name} scope global || true
+sudo ip route flush dev ${interface_name} || true
 sudo ip link set ${interface_name} up
 sudo ip addr add ${worker_ip} dev ${interface_name}
-sudo ip route replace default via ${gateway} dev ${interface_name}
+sudo ip route replace default via ${gateway} dev ${interface_name} src ${worker_address}
 printf '%s\n' ${dns_servers} | awk '{ for (i = 1; i <= NF; i++) print "nameserver " \$i }' | sudo tee /etc/resolv.conf >/dev/null
 sudo ifup --force ${interface_name} 2>/dev/null || true
 sudo ssh-keygen -A