diff --git a/terraform/pve1/main.tf b/terraform/pve1/main.tf index ee89a30..8db3b2a 100644 --- a/terraform/pve1/main.tf +++ b/terraform/pve1/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { proxmox = { source = "telmate/proxmox" - version = "~> 2.9" + version = "3.0.2-rc05" } local = { source = "hashicorp/local" @@ -20,32 +20,36 @@ provider "proxmox" { pm_tls_insecure = var.proxmox_tls_insecure } -# K3s Server VM on pve1 +# K3s Server VM on acemagician resource "proxmox_vm_qemu" "k3s_server_1" { name = "k3s-server-1" - target_node = "pve1" + target_node = "acemagician" clone = var.ubuntu_template - cores = var.k3s_server_1_config.cores - sockets = 1 - memory = var.k3s_server_1_config.memory - agent = 1 + cpu { + cores = var.k3s_server_1_config.cores + sockets = 1 + } + + memory = var.k3s_server_1_config.memory + agent = 1 boot = "order=scsi0" scsihw = "virtio-scsi-single" onboot = true network { + id = 0 model = "virtio" bridge = var.k3s_network_bridge } disk { - slot = 0 + slot = "scsi0" size = var.k3s_server_1_config.disk_size - type = "scsi" + type = "disk" storage = var.storage_pool - iothread = 1 + iothread = true } ipconfig0 = "ip=${var.k3s_server_1_config.ip},gw=${var.k3s_gateway}" diff --git a/terraform/pve2/main.tf b/terraform/pve2/main.tf index 36975b1..047af38 100644 --- a/terraform/pve2/main.tf +++ b/terraform/pve2/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { proxmox = { source = "telmate/proxmox" - version = "~> 2.9" + version = "3.0.2-rc05" } local = { source = "hashicorp/local" @@ -20,32 +20,36 @@ provider "proxmox" { pm_tls_insecure = var.proxmox_tls_insecure } -# K3s Server VM on pve2 +# K3s Server VM on elitedesk resource "proxmox_vm_qemu" "k3s_server_2" { name = "k3s-server-2" - target_node = "pve2" + target_node = "elitedesk" clone = var.ubuntu_template - cores = var.k3s_server_2_config.cores - sockets = 1 - memory = var.k3s_server_2_config.memory - agent = 1 + cpu { + cores = var.k3s_server_2_config.cores + sockets = 1 + } + + memory = var.k3s_server_2_config.memory + agent = 1 boot = "order=scsi0" scsihw = "virtio-scsi-single" onboot = true network { + id = 0 model = "virtio" bridge = var.k3s_network_bridge } disk { - slot = 0 + slot = "scsi0" size = var.k3s_server_2_config.disk_size - type = "scsi" + type = "disk" storage = var.storage_pool - iothread = 1 + iothread = true } ipconfig0 = "ip=${var.k3s_server_2_config.ip},gw=${var.k3s_gateway}" diff --git a/terraform/pve3/main.tf b/terraform/pve3/main.tf index 323f68e..04cab29 100644 --- a/terraform/pve3/main.tf +++ b/terraform/pve3/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { proxmox = { source = "telmate/proxmox" - version = "~> 2.9" + version = "3.0.2-rc05" } local = { source = "hashicorp/local" @@ -20,32 +20,36 @@ provider "proxmox" { pm_tls_insecure = var.proxmox_tls_insecure } -# etcd Witness VM on pve3 +# etcd Witness VM on thinkpad resource "proxmox_vm_qemu" "etcd_witness" { name = "etcd-witness" - target_node = "pve3" + target_node = "thinkpad" clone = var.ubuntu_template - cores = var.etcd_witness_config.cores - sockets = 1 - memory = var.etcd_witness_config.memory - agent = 1 + cpu { + cores = var.etcd_witness_config.cores + sockets = 1 + } + + memory = var.etcd_witness_config.memory + agent = 1 boot = "order=scsi0" scsihw = "virtio-scsi-single" onboot = true network { + id = 0 model = "virtio" bridge = var.k3s_network_bridge } disk { - slot = 0 + slot = "scsi0" size = var.etcd_witness_config.disk_size - type = "scsi" + type = "disk" storage = var.storage_pool - iothread = 1 + iothread = true } ipconfig0 = "ip=${var.etcd_witness_config.ip},gw=${var.k3s_gateway}"