From 3ac7c44776ec324dc95b8f469f1a441957ece2b6 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Sat, 11 May 2024 07:52:56 -0500 Subject: [PATCH] update --- terraform/main.tf | 8 ++++---- terraform/terraform.tfvars | 2 ++ terraform/variables.tf | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/terraform/main.tf b/terraform/main.tf index 52120fc..fb63c15 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -48,7 +48,7 @@ resource "proxmox_vm_qemu" "k3master" { count = var.k3master.count ciuser = "administrator" - vmid = "20${var.k3master.ip[count.index]}" + vmid = "${var.k3master.vlan}${var.k3master.ip[count.index]}" name = var.k3master.name[count.index] target_node = var.k3master.node[count.index] clone = var.k3master.template[count.index] @@ -82,7 +82,7 @@ resource "proxmox_vm_qemu" "k3master" { ] } #Cloud Init Settings - ipconfig0 = "ip=192.168.10.${var.k3master.ip[count.index]}/24,gw=192.168.10.1" + ipconfig0 = "ip=192.168.${var.k3master.vlan}.${var.k3master.ip[count.index]}/24,gw=192.168.10.1" searchdomain = "durp.loc" nameserver = var.dnsserver } @@ -90,7 +90,7 @@ resource "proxmox_vm_qemu" "k3master" { resource "proxmox_vm_qemu" "k3server" { count = var.k3server.count ciuser = "administrator" - vmid = "20${var.k3server.ip[count.index]}" + vmid = "${var.k3server.vlan}${var.k3server.ip[count.index]}" name = var.k3server.name[count.index] target_node = var.k3server.node[count.index] clone = var.k3server.template[count.index] @@ -124,7 +124,7 @@ resource "proxmox_vm_qemu" "k3server" { ] } #Cloud Init Settings - ipconfig0 = "ip=192.168.10.${var.k3server.ip[count.index]}/24,gw=192.168.10.1" + ipconfig0 = "ip=192.168.${var.k3server.vlan}.${var.k3server.ip[count.index]}/24,gw=192.168.10.1" searchdomain = "durp.loc" nameserver = var.dnsserver } diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars index 7974cdc..bcbc269 100644 --- a/terraform/terraform.tfvars +++ b/terraform/terraform.tfvars @@ -10,6 +10,7 @@ k3master = { template = ["Debian12-Template"] node = ["overlord"] ip = ["10"] + vlan = 10 } k3server = { @@ -22,4 +23,5 @@ k3server = { template = ["Debian12-Template", "Debian12-Template"] node = ["mothership", "mothership"] ip = ["20", "21"] + vlan = 10 } diff --git a/terraform/variables.tf b/terraform/variables.tf index 949d7b8..a3c6670 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -31,6 +31,7 @@ variable "k3master" { template = list(string) node = list(string) ip = list(number) + vlan = number }) } @@ -46,5 +47,6 @@ variable "k3server" { template = list(string) node = list(string) ip = list(number) + vlan = number }) }