From d3baed480543ba796805b785162e825870d81041 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Mon, 11 May 2026 05:26:18 -0500 Subject: [PATCH] update --- infra/main.tf | 22 ++++---- infra/postgres.tf | 134 +++++++--------------------------------------- 2 files changed, 29 insertions(+), 127 deletions(-) diff --git a/infra/main.tf b/infra/main.tf index 894a56b..0fd3745 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -56,17 +56,17 @@ locals { # node = ["mothership", "overlord", "vanguard"] # ip = ["31", "32", "33"] #} - #postgres = { - # tags = "postgres" - # count = 3 - # name = ["postgres-01", "postgres-02", "postgres-03"] - # cores = 4 - # memory = "4096" - # drive = 40 - # storage = "cache-domains" - # node = ["mothership", "overlord", "vanguard"] - # ip = ["34", "35", "36"] - #} + postgres = { + tags = "postgres" + count = 3 + name = ["postgres-01", "postgres-02", "postgres-03"] + cores = 4 + memory = "4096" + drive = 40 + storage = "cache-domains" + node = ["mothership", "overlord", "vanguard"] + ip = ["34", "35", "36"] + } pihole = { tags = "pihole" count = 3 diff --git a/infra/postgres.tf b/infra/postgres.tf index 47b8daa..ac7bb35 100644 --- a/infra/postgres.tf +++ b/infra/postgres.tf @@ -1,116 +1,18 @@ -#resource "proxmox_vm_qemu" "haproxy" { -# count = local.haproxy.count -# ciuser = "administrator" -# vmid = "${local.vlan}${local.haproxy.ip[count.index]}" -# name = local.haproxy.name[count.index] -# target_node = local.haproxy.node[count.index] -# clone = local.template -# tags = local.haproxy.tags -# qemu_os = "l26" -# full_clone = true -# os_type = "cloud-init" -# agent = 1 -# cores = local.haproxy.cores -# sockets = 1 -# cpu_type = "host" -# memory = local.haproxy.memory -# scsihw = "virtio-scsi-pci" -# #bootdisk = "scsi0" -# boot = "order=virtio0" -# onboot = true -# sshkeys = local.sshkeys -# vga { -# type = "serial0" -# } -# serial { -# id = 0 -# type = "socket" -# } -# disks { -# ide { -# ide2 { -# cloudinit { -# storage = local.haproxy.storage -# } -# } -# } -# virtio { -# virtio0 { -# disk { -# size = local.haproxy.drive -# format = local.format -# storage = local.haproxy.storage -# } -# } -# } -# } -# network { -# id = 0 -# model = "virtio" -# bridge = "vmbr0" -# tag = local.vlan -# } -# #Cloud Init Settings -# ipconfig0 = "ip=192.168.${local.vlan}.${local.haproxy.ip[count.index]}/24,gw=192.168.${local.vlan}.1" -# searchdomain = "durp.loc" -# nameserver = local.dnsserver -#} -# -#resource "proxmox_vm_qemu" "postgres" { -# count = local.postgres.count -# ciuser = "administrator" -# vmid = "${local.vlan}${local.postgres.ip[count.index]}" -# name = local.postgres.name[count.index] -# target_node = local.postgres.node[count.index] -# clone = local.template -# tags = local.postgres.tags -# qemu_os = "l26" -# full_clone = true -# os_type = "cloud-init" -# agent = 1 -# cores = local.postgres.cores -# sockets = 1 -# cpu_type = "host" -# memory = local.postgres.memory -# scsihw = "virtio-scsi-pci" -# #bootdisk = "scsi0" -# boot = "order=virtio0" -# onboot = true -# sshkeys = local.sshkeys -# vga { -# type = "serial0" -# } -# serial { -# id = 0 -# type = "socket" -# } -# disks { -# ide { -# ide2 { -# cloudinit { -# storage = local.postgres.storage -# } -# } -# } -# virtio { -# virtio0 { -# disk { -# size = local.postgres.drive -# format = local.format -# storage = local.postgres.storage -# } -# } -# } -# } -# network { -# id = 0 -# model = "virtio" -# bridge = "vmbr0" -# tag = local.vlan -# } -# #Cloud Init Settings -# ipconfig0 = "ip=192.168.${local.vlan}.${local.postgres.ip[count.index]}/24,gw=192.168.${local.vlan}.1" -# searchdomain = "durp.loc" -# nameserver = local.dnsserver -#} -# \ No newline at end of file +module "k3s_masters" { + # Use 'git::' prefix and append the branch/tag/commit with '?ref=' + source = "git::https://gitlab.durp.info/durfy/modules/terraform/proxmox-vm.git?ref=main" + + # Inputs + count = local.postgres.count + vm_names = local.postgres.name + target_nodes = local.postgres.node + vm_ips = local.postgres.ip + vlan = local.vlan + template = local.template + storage = local.postgres.storage + cores = local.postgres.cores + memory = local.postgres.memory + sshkeys = local.sshkeys + dnsserver = local.dnsserver + drive_size = local.postgres.drive +}