From b5eb756ac0e4d1504e4077c06401c9f1bd88acb0 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Sat, 10 Dec 2022 20:14:20 +0000 Subject: [PATCH] Update terraform/main.tf, terraform/terraform.tfvars, terraform/variables.tf --- terraform/main.tf | 53 +++++--------------------------------- terraform/terraform.tfvars | 36 +++++++++----------------- terraform/variables.tf | 28 +++++--------------- 3 files changed, 24 insertions(+), 93 deletions(-) diff --git a/terraform/main.tf b/terraform/main.tf index 7aa33e3..58f3ad1 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -6,8 +6,8 @@ resource "proxmox_vm_qemu" "k3master" { ciuser = "administrator" vmid = "20${var.k3master.ip[count.index]}" name = var.k3master.name[count.index] - target_node = var.k3master.node - clone = var.k3master.template + target_node = var.k3master.node[count.index] + clone = var.k3master.template[count.index] full_clone = true os_type = "cloud-init" agent = 1 @@ -20,7 +20,7 @@ resource "proxmox_vm_qemu" "k3master" { boot = "c" onboot = true disk { - size = var.k3master.drive + size = var.k3master.drive[count.index] type = "scsi" storage = var.k3master.storage ssd = 1 @@ -47,8 +47,8 @@ resource "proxmox_vm_qemu" "k3server" { ciuser = "administrator" vmid = "20${var.k3server.ip[count.index]}" name = var.k3server.name[count.index] - target_node = var.k3server.node - clone = var.k3server.template + target_node = var.k3server.node[count.index] + clone = var.k3server.template[count.index] full_clone = true os_type = "cloud-init" agent = 1 @@ -61,7 +61,7 @@ resource "proxmox_vm_qemu" "k3server" { boot = "c" onboot = true disk { - size = var.k3server.drive + size = var.k3server.drive[count.index] type = "scsi" storage = var.k3server.storage ssd = 1 @@ -82,44 +82,3 @@ resource "proxmox_vm_qemu" "k3server" { nameserver = var.dnsserver sshkeys = var.sshkeys } - -resource "proxmox_vm_qemu" "k3server2" { - count = var.k3server2.count - ciuser = "administrator" - vmid = "20${var.k3server2.ip[count.index]}" - name = var.k3server2.name[count.index] - target_node = var.k3server2.node - clone = var.k3server2.template - full_clone = true - os_type = "cloud-init" - agent = 1 - cores = var.k3server2.cores - sockets = 1 - cpu = "host" - memory = var.k3server2.memory - scsihw = "virtio-scsi-pci" - bootdisk = "scsi0" - boot = "c" - onboot = true - disk { - size = var.k3server2.drive - type = "scsi" - storage = var.k3server2.storage - ssd = 1 - backup = 0 - } - network { - model = "virtio" - bridge = "vmbr1" - } - lifecycle { - ignore_changes = [ - network, - ] - } - #Cloud Init Settings - ipconfig0 = "ip=192.168.20.${var.k3server2.ip[count.index]}/24,gw=192.168.20.1" - searchdomain = "durp.loc" - nameserver = var.dnsserver - sshkeys = var.sshkeys -} diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars index d303edc..1dc3a81 100644 --- a/terraform/terraform.tfvars +++ b/terraform/terraform.tfvars @@ -3,37 +3,25 @@ dnsserver = "192.168.20.1" sshkeys = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDTYqag8OKcV6kIitn3Axlyi3Xr9EeybG10wlglw34fYF0pY+OERy7zZKEju4ijZzQ7eWNlcXLYSorm5Tngkvnz4vbM4b9R7gZjTV9drSGDo0BLkMXNuSTrKwGeokcNkxh+HZcWSK4/SE5zPzvkPj1UvmAgQ4P4N79mqPe5/9gAvdrlUWEtuqVdEHc/FMk4kEZsRu4lg58KoghNCRYMYHOyd1rbHsuWpX5NumPxnosWG22jzqj46rUWEXvA7MrCGGbUDlk5+/h7Bvw4O8nGZLEo/qyaYvChTBj/UqYYBssC4VlW/SNJB1yfrklqdtcknmFVJBi174cQtzZDXOerwneh8/+t7wWpcxkWscxYrwdJspzAU/NGk02xDPaG4F1mdgZ6HIZCQAaw/EbaNbiuU+bhdngEIHUvVmdiy4T09FWIWuJxO6FnAiVIU5K8LpqGLTFp7kjOwAczdQ+KVojm/1A5W/ZoTE/y3Ni1fVaOJFCxSgU7qiKAm7hb2ZXvznNgryc=" k3master = { - count = 3 - name = ["master01", "master02", "master03"] + count = 6 + name = ["master01", "master02", "master03","master04", "master05", "master06"] cores = 2 memory = "2048" drive = "20G" storage = "NVMeSSD" template = "CentOS9-Template" - node = "overlord" - ip = ["121", "122", "123"] + node = ["overlord","overlord","overlord","mothership","mothership","mothership"] + ip = ["121", "122", "123","124", "125", "126"] } k3server = { - count = 1 - name = ["node03"] - cores = 12 - memory = "40960" - drive = "160G" + count = 6 + name = ["node01", "node02","node03", "node04","node05", "node06"] + cores = 4 + memory = "8192" + drive = ["160G","20G","20G","160G","20G","20G"] storage = "NVMeSSD" - template = "CentOS9-Template" - node = "overlord" - ip = ["126"] -} - -k3server2 = { - count = 1 - name = ["node06"] - cores = 12 - memory = "40960" - drive = "160G" - storage = "NVMeSSD" - template = "CentOS9-Template2" - node = "mothership" - ip = ["129"] + template = ["CentOS9-Template","CentOS9-Template","CentOS9-Template","CentOS9-Template2","CentOS9-Template2","CentOS9-Template2"] + node = ["overlord","overlord","overlord","mothership","mothership","mothership"] + ip = ["141", "142", "143","144", "145", "146"] } diff --git a/terraform/variables.tf b/terraform/variables.tf index 8159d6f..1c1e095 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -31,10 +31,10 @@ variable "k3master" { name = list(string) cores = number memory = number - drive = string + drive = list(string) storage = string - template = string - node = string + template = list(string) + node = list(string) ip = list(number) }) } @@ -46,26 +46,10 @@ variable "k3server" { name = list(string) cores = number memory = number - drive = string + drive = list(string) storage = string - template = string - node = string - ip = list(number) - }) -} - - -variable "k3server2" { - description = "Defaults of worker nodes in K3S" - type = object({ - count = number - name = list(string) - cores = number - memory = number - drive = string - storage = string - template = string - node = string + template = list(string) + node = list(string) ip = list(number) }) }