update

terraform/defaults.tf

@@ -9,7 +9,7 @@ terraform {
 }
 
 provider "proxmox" {
-  pm_parallel     = 3
+  pm_parallel     = 1
   pm_tls_insecure = true
   pm_api_url      = var.pm_api_url
   pm_user         = var.pm_user

terraform/main.tf

@@ -3,61 +3,55 @@ locals {
     prd = {
       dnsserver = "192.168.11.1"
       tags      = "k3s_prd"
+      vlan      = 11
       k3master = {
-        count    = 1
-        name     = ["master-prd"]
-        cores    = 4
-        memory   = "4096"
-        drive    = "20G"
-        storage  = "cache-domains"
-        template = ["Debian12-Template"]
-        node     = ["overlord"]
-        ip       = ["10"]
-        vlan     = 11
+        count  = 1
+        name   = ["master-prd"]
+        cores  = 4
+        memory = "4096"
+        drive  = 20
+        node   = ["overlord"]
+        ip     = ["10"]
       }
       k3server = {
-        count    = 2
-        name     = ["node01-prd", "node02-prd"]
-        cores    = 4
-        memory   = "4096"
-        drive    = "80G"
-        storage  = "cache-domains"
-        template = ["Debian12-Template", "Debian12-Template"]
-        node     = ["mothership", "mothership"]
-        ip       = ["20", "21"]
-        vlan     = 11
+        count  = 2
+        name   = ["node01-prd", "node02-prd"]
+        cores  = 4
+        memory = "4096"
+        drive  = 80
+        node   = ["mothership", "mothership"]
+        ip     = ["20", "21"]
       }
     }
     dev = {
       dnsserver = "192.168.10.1"
       tags      = "k3s_dev"
+      vlan      = 10
       k3master = {
-        count    = 1
-        name     = ["master-dev"]
-        cores    = 4
-        memory   = "4096"
-        drive    = "20G"
-        storage  = "cache-domains"
-        template = ["Debian12-Template"]
-        node     = ["overlord"]
-        ip       = ["10"]
-        vlan     = 10
+        count  = 1
+        name   = ["master-dev"]
+        cores  = 4
+        memory = "4096"
+        drive  = 20
+        node   = ["overlord"]
+        ip     = ["10"]
       }
       k3server = {
-        count    = 2
-        name     = ["node01-dev", "node02-dev"]
-        cores    = 4
-        memory   = "4096"
-        drive    = "60G"
-        storage  = "cache-domains"
-        template = ["Debian12-Template", "Debian12-Template"]
-        node     = ["mothership", "mothership"]
-        ip       = ["20", "21"]
-        vlan     = 10
+        count  = 2
+        name   = ["node01-dev", "node02-dev"]
+        cores  = 4
+        memory = "4096"
+        drive  = 60
+        node   = ["mothership", "mothership"]
+        ip     = ["20", "21"]
       }
     }
     default = {
-      sshkeys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL88nWIyxN4aYTJCxz2/MiorLeNtoVwir995tOXzdzCr laptop"
+      sshkeys    = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL88nWIyxN4aYTJCxz2/MiorLeNtoVwir995tOXzdzCr laptop"
+      template   = "Debian12-Template"
+      storage    = "cache-domains"
+      emulatessd = true
+      format     = "raw"
     }
   }
 }
@@ -65,57 +59,49 @@ locals {
 resource "proxmox_vm_qemu" "k3master" {
   count       = local.config.k3master.count
   ciuser      = "administrator"
-  vmid        = "${local.config.k3master.vlan}${local.config.k3master.ip[count.index]}"
+  vmid        = "${local.config.vlan}${local.config.k3master.ip[count.index]}"
   name        = local.config.k3master.name[count.index]
   target_node = local.config.k3master.node[count.index]
-  clone       = local.config.k3master.template[count.index]
+  clone       = local.config.template
   tags        = local.config.tags
   qemu_os     = "l26"
   full_clone  = true
   os_type     = "cloud-init"
   agent       = 1
   cores       = local.config.k3master.cores
-  numa        = true
-  hotplug     = "network,disk,usb,cpu,memory"
   sockets     = 1
   cpu         = "host"
   memory      = local.config.k3master.memory
   scsihw      = "virtio-scsi-pci"
   #bootdisk    = "scsi0"
-  boot    = "order=scsi0"
+  boot    = "order=virtio0"
   onboot  = true
   sshkeys = local.config.sshkeys
   disks {
     ide {
       ide2 {
         cloudinit {
-          storage = local.config.k3master.storage
+          storage = local.config.storage
         }
       }
     }
-    scsi {
-      scsi0 {
+    virtio {
+      virtio0 {
         disk {
-          size       = local.config.k3master.drive
-          format     = "raw"
-          storage    = local.config.k3master.storage
-          emulatessd = true
+          size    = local.config.k3master.drive
+          format  = local.config.format
+          storage = local.config.storage
         }
       }
     }
   }
   network {
     model  = "virtio"
-    bridge = "vmbr1"
+    bridge = "vmbr0"
     tag    = local.config.vlan
   }
-  lifecycle {
-    ignore_changes = [
-      network,
-    ]
-  }
   #Cloud Init Settings
-  ipconfig0    = "ip=192.168.${local.config.k3master.vlan}.${local.config.k3master.ip[count.index]}/24,gw=192.168.10.1"
+  ipconfig0    = "ip=192.168.${local.config.vlan}.${local.config.k3master.ip[count.index]}/24,gw=${local.config.dnsserver}"
   searchdomain = "durp.loc"
   nameserver   = local.config.dnsserver
 }
@@ -123,56 +109,49 @@ resource "proxmox_vm_qemu" "k3master" {
 resource "proxmox_vm_qemu" "k3server" {
   count       = local.config.k3server.count
   ciuser      = "administrator"
-  vmid        = "${local.config.k3server.vlan}${local.config.k3server.ip[count.index]}"
+  vmid        = "${local.config.vlan}${local.config.k3server.ip[count.index]}"
   name        = local.config.k3server.name[count.index]
   target_node = local.config.k3server.node[count.index]
-  clone       = local.config.k3server.template[count.index]
+  clone       = local.config.template
   tags        = local.config.tags
   qemu_os     = "l26"
   full_clone  = true
   os_type     = "cloud-init"
   agent       = 1
   cores       = local.config.k3server.cores
-  numa        = true
-  hotplug     = "network,disk,usb,cpu,memory"
   sockets     = 1
   cpu         = "host"
   memory      = local.config.k3server.memory
   scsihw      = "virtio-scsi-pci"
   #bootdisk    = "scsi0"
-  boot    = "order=scsi0"
+  boot    = "order=virtio0"
   onboot  = true
   sshkeys = local.config.sshkeys
   disks {
     ide {
       ide2 {
         cloudinit {
-          storage = local.config.k3master.storage
+          storage = local.config.storage
         }
       }
     }
-    scsi {
-      scsi0 {
+    virtio {
+      virtio0 {
         disk {
-          size       = local.config.k3master.drive
-          format     = "raw"
-          storage    = local.config.k3master.storage
-          emulatessd = true
+          size    = local.config.k3server.drive
+          format  = local.config.format
+          storage = local.config.storage
         }
       }
     }
   }
   network {
     model  = "virtio"
-    bridge = "vmbr1"
-  }
-  lifecycle {
-    ignore_changes = [
-      network,
-    ]
+    bridge = "vmbr0"
+    tag    = local.config.vlan
   }
   #Cloud Init Settings
-  ipconfig0    = "ip=192.168.${local.config.k3server.vlan}.${local.config.k3server.ip[count.index]}/24,gw=192.168.10.1"
+  ipconfig0    = "ip=192.168.${local.config.vlan}.${local.config.k3server.ip[count.index]}/24,gw=${local.config.dnsserver}"
   searchdomain = "durp.loc"
   nameserver   = local.config.dnsserver
 }