diff --git a/terraform/cloud-init.tf b/terraform/cloud-init.tf index 5ca7fe7..2155f72 100644 --- a/terraform/cloud-init.tf +++ b/terraform/cloud-init.tf @@ -8,7 +8,7 @@ resource "proxmox_cloud_init_disk" "ci" { name = each.key pve_node = each.value.target_node - storage = "local" # Cloud-init disks must be on storage that supports ISO/snippets + storage = "local" # Cloud-init disks must be on storage that supports ISO/snippets # User data includes SSH keys and optionally NIXOS_FLAKE_BRANCH user_data = <<-EOT @@ -25,34 +25,34 @@ resource "proxmox_cloud_init_disk" "ci" { : ""} EOT - # Network configuration - static IP or DHCP - network_config = each.value.ip != null ? yamlencode({ - version = 1 - config = [{ - type = "physical" - name = "ens18" - subnets = [{ - type = "static" - address = each.value.ip - gateway = each.value.gateway - dns_nameservers = split(" ", each.value.nameservers) - dns_search = [each.value.search_domain] - }] +# Network configuration - static IP or DHCP +network_config = each.value.ip != null ? yamlencode({ + version = 1 + config = [{ + type = "physical" + name = "ens18" + subnets = [{ + type = "static" + address = each.value.ip + gateway = each.value.gateway + dns_nameservers = split(" ", each.value.nameservers) + dns_search = [each.value.search_domain] }] - }) : yamlencode({ - version = 1 - config = [{ - type = "physical" - name = "ens18" - subnets = [{ - type = "dhcp" - }] + }] + }) : yamlencode({ + version = 1 + config = [{ + type = "physical" + name = "ens18" + subnets = [{ + type = "dhcp" }] - }) + }] +}) - # Instance metadata - meta_data = yamlencode({ - instance_id = sha1(each.key) - local-hostname = each.key - }) +# Instance metadata +meta_data = yamlencode({ + instance_id = sha1(each.key) + local-hostname = each.key +}) } diff --git a/terraform/vms.tf b/terraform/vms.tf index c36359f..01fb272 100644 --- a/terraform/vms.tf +++ b/terraform/vms.tf @@ -39,11 +39,11 @@ locals { flake_branch = "pipeline-testing-improvements" } "vault01" = { - ip = "10.69.13.19/24" - cpu_cores = 2 - memory = 2048 - disk_size = "20G" - flake_branch = "vault-setup" # Bootstrap from this branch instead of master + ip = "10.69.13.19/24" + cpu_cores = 2 + memory = 2048 + disk_size = "20G" + flake_branch = "vault-setup" # Bootstrap from this branch instead of master } }