chore: cleanup variables

Author: glitchedmob

src/tf/outputs.tf

@@ -9,18 +9,18 @@ output "workload_vm_ids" {
 output "workload_vm_ipv4" {
   description = "Declared IPv4 addresses for workload VMs"
   value = {
-    for name, spec in var.workload_vms :
+    for name, spec in local.workload_vms :
     name => spec.ipv4_address
   }
 }
 
 output "ansible_hosts" {
   description = "Host map for Ansible inventory generation"
   value = {
-    for name, spec in var.workload_vms :
+    for name, spec in local.workload_vms :
     name => {
       ansible_host         = spec.ipv4_address
-      ansible_user         = var.vm_user
+      ansible_user         = local.vm_user
       node_name            = spec.node_name
       vm_id                = spec.vm_id
       role                 = spec.role

src/tf/ssh_key_inventory.tf

@@ -1,11 +1,12 @@
 locals {
+  vm_ssh_key_name             = "infra-vm-workloads"
   vm_ssh_key_version          = 1
   vm_ssh_private_key_ssm_path = "/vm-workloads/sgfdevs/infra-vm-workloads/ssh-private-key"
 }
 
 module "ssh_key" {
   source               = "git::https://github.com/glitchedmob/infra-shared.git//src/tf/modules/ssh-key?ref=main"
-  name                 = var.vm_ssh_key_name
+  name                 = local.vm_ssh_key_name
   key_version          = local.vm_ssh_key_version
   ssm_private_key_path = local.vm_ssh_private_key_ssm_path
 }
@@ -24,7 +25,7 @@ resource "ansible_group" "k3s_cluster" {
 }
 
 resource "ansible_host" "workload" {
-  for_each = var.workload_vms
+  for_each = local.workload_vms
 
   name = each.key
   groups = [
@@ -34,7 +35,7 @@ resource "ansible_host" "workload" {
 
   variables = {
     ansible_host              = each.value.ipv4_address
-    ansible_user              = var.vm_user
+    ansible_user              = local.vm_user
     node_name                 = each.value.node_name
     vm_id                     = tostring(each.value.vm_id)
     ssm_private_key_path      = module.ssh_key.ssm_path

src/tf/variables.tf

@@ -22,118 +22,3 @@ variable "aws_region" {
   type        = string
   default     = "us-east-2"
 }
-
-variable "proxmox_pool_id" {
-  description = "Proxmox pool for workload VMs"
-  type        = string
-  default     = "sgfdevs"
-}
-
-variable "workload_vms" {
-  description = "Workload VMs to provision"
-  type = map(object({
-    node_name    = string
-    vm_id        = number
-    ipv4_address = string
-    role         = string
-  }))
-
-  default = {
-    vm-workload-01 = {
-      node_name    = "x86-node-01"
-      vm_id        = 4201
-      ipv4_address = "10.20.4.10"
-      role         = "server"
-    }
-    vm-workload-02 = {
-      node_name    = "x86-node-02"
-      vm_id        = 4202
-      ipv4_address = "10.20.4.11"
-      role         = "agent"
-    }
-  }
-
-  validation {
-    condition     = length(var.workload_vms) == 2
-    error_message = "Exactly two workload VMs must be defined."
-  }
-
-  validation {
-    condition = alltrue([
-      for vm in values(var.workload_vms) : contains(["server", "agent"], vm.role)
-    ])
-    error_message = "Each workload VM role must be either 'server' or 'agent'."
-  }
-}
-
-variable "sgfdevs_cidr" {
-  description = "CIDR for sgfdevs workload network"
-  type        = string
-  default     = "10.20.4.0/22"
-}
-
-variable "vm_user" {
-  description = "Primary cloud-init username"
-  type        = string
-  default     = "ubuntu"
-}
-
-variable "vm_additional_ssh_public_keys" {
-  description = "Optional additional SSH public keys for cloud-init user"
-  type        = list(string)
-  default     = []
-}
-
-variable "vm_ssh_key_name" {
-  description = "Identifier for generated workload SSH key"
-  type        = string
-  default     = "infra-vm-workloads"
-}
-
-variable "vm_cpu_cores" {
-  description = "CPU cores per workload VM"
-  type        = number
-  default     = 4
-}
-
-variable "vm_cpu_type" {
-  description = "CPU model for workload VMs"
-  type        = string
-  default     = "x86-64-v2-AES"
-}
-
-variable "vm_memory_mb" {
-  description = "Memory in MB per workload VM"
-  type        = number
-  default     = 8192
-}
-
-variable "vm_disk_size_gb" {
-  description = "Root disk size in GB"
-  type        = number
-  default     = 80
-}
-
-variable "vm_datastore_id" {
-  description = "Proxmox datastore for root disks"
-  type        = string
-  default     = "vm-data"
-}
-
-variable "vm_cloud_init_datastore_id" {
-  description = "Datastore for cloud-init disk"
-  type        = string
-  default     = "vm-data"
-}
-
-variable "vm_network_bridge" {
-  description = "Bridge for VM network interface"
-  type        = string
-  default     = "vmbr0"
-}
-
-variable "vm_vlan_id" {
-  description = "VLAN ID for workload VM network"
-  type        = number
-  default     = 13
-}

src/tf/workload_vms.tf

@@ -1,21 +1,49 @@
 locals {
-  sgfdevs_prefix  = tonumber(split("/", var.sgfdevs_cidr)[1])
-  sgfdevs_gateway = cidrhost(var.sgfdevs_cidr, 1)
+  proxmox_pool_id               = "sgfdevs"
+  sgfdevs_cidr                  = "10.20.4.0/22"
+  vm_user                       = "admin"
+  vm_additional_ssh_public_keys = []
+  vm_cpu_cores                  = 4
+  vm_cpu_type                   = "x86-64-v2-AES"
+  vm_memory_mb                  = 8192
+  vm_disk_size_gb               = 80
+  vm_datastore_id               = "vm-data"
+  vm_cloud_init_datastore_id    = "vm-data"
+  vm_network_bridge             = "sgfdevs"
+  vm_vlan_id                    = 13
+
+  workload_vms = {
+    vm-workload-01 = {
+      node_name    = "x86-node-01"
+      vm_id        = 4201
+      ipv4_address = "10.20.4.10"
+      role         = "server"
+    }
+    vm-workload-02 = {
+      node_name    = "x86-node-02"
+      vm_id        = 4202
+      ipv4_address = "10.20.4.11"
+      role         = "agent"
+    }
+  }
+
+  sgfdevs_prefix  = tonumber(split("/", local.sgfdevs_cidr)[1])
+  sgfdevs_gateway = cidrhost(local.sgfdevs_cidr, 1)
   vm_template_file_ids = {
     x86-node-01 = "x86-node-01:iso/debian-13-generic-amd64.qcow2"
     x86-node-02 = "x86-node-02:iso/debian-13-generic-amd64.qcow2"
   }
 }
 
 resource "proxmox_virtual_environment_vm" "workload" {
-  for_each = var.workload_vms
+  for_each = local.workload_vms
 
   name        = each.key
   description = "Managed by OpenTofu for sgfdevs workload cluster"
   tags        = ["managed-by-tofu", "sgfdevs", "k3s"]
   node_name   = each.value.node_name
   vm_id       = each.value.vm_id
-  pool_id     = var.proxmox_pool_id
+  pool_id     = local.proxmox_pool_id
 
   started = true
   on_boot = true
@@ -25,32 +53,32 @@ resource "proxmox_virtual_environment_vm" "workload" {
   }
 
   cpu {
-    cores = var.vm_cpu_cores
-    type  = var.vm_cpu_type
+    cores = local.vm_cpu_cores
+    type  = local.vm_cpu_type
   }
 
   memory {
-    dedicated = var.vm_memory_mb
-    floating  = var.vm_memory_mb
+    dedicated = local.vm_memory_mb
+    floating  = local.vm_memory_mb
   }
 
   disk {
-    datastore_id = var.vm_datastore_id
+    datastore_id = local.vm_datastore_id
     file_id      = local.vm_template_file_ids[each.value.node_name]
     interface    = "scsi0"
     iothread     = true
     discard      = "on"
-    size         = var.vm_disk_size_gb
+    size         = local.vm_disk_size_gb
   }
 
   network_device {
-    bridge  = var.vm_network_bridge
+    bridge  = local.vm_network_bridge
     model   = "virtio"
-    vlan_id = var.vm_vlan_id
+    vlan_id = local.vm_vlan_id
   }
 
   initialization {
-    datastore_id = var.vm_cloud_init_datastore_id
+    datastore_id = local.vm_cloud_init_datastore_id
 
     ip_config {
       ipv4 {
@@ -60,10 +88,10 @@ resource "proxmox_virtual_environment_vm" "workload" {
     }
 
     user_account {
-      username = var.vm_user
+      username = local.vm_user
       keys = concat(
         [module.ssh_key.public_key],
-        [for key in var.vm_additional_ssh_public_keys : trimspace(key)]
+        [for key in local.vm_additional_ssh_public_keys : trimspace(key)]
       )
     }
   }