terraform fmt

.gitea/workflows/terraform-apply.yml

@@ -16,7 +16,6 @@ jobs:
       pull-requests: write
 
     env:
-      TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY }}
       TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
       TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
 

.gitea/workflows/terraform-destroy.yml

@@ -2,7 +2,9 @@ name: Gitea Destroy Terraform
 run-name: ${{ gitea.actor }} triggered a Terraform Destroy 🧨
 
 on:
-  workflow_dispatch: # Manual trigger
+  push:
+    branches:
+      - destroy
 
 jobs:
   destroy:
@@ -14,10 +16,8 @@ jobs:
       pull-requests: write
 
     env:
-        TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY }}
+      TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
-        TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
+      TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
-        TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
-
 
     steps:
       - name: Checkout repository

.gitea/workflows/terraform-plan.yml

@@ -17,9 +17,10 @@ jobs:
       pull-requests: write
 
     env:
-      TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY }}
+      TF_VAR_TAILSCALE_KEY: ${{ secrets.TAILSCALE_KEY }}
       TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
-        #      TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
+      TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
+
 
     steps:
       - name: Checkout repository

terraform/cloud-init.tf

@@ -4,6 +4,7 @@ data "template_file" "cloud_init_alpaca" {
   template = file("${path.module}/files/cloud_init.yaml")
 
   vars = {
+    ssh_key    = var.ssh_key
     hostname   = "alpaca-${count.index + 1}"
     domain     = "home.arpa"
     TS_AUTHKEY = var.TS_AUTHKEY
@@ -17,20 +18,20 @@ resource "local_file" "cloud_init_alpaca" {
   filename = "${path.module}/files/cloud_init_alpaca_${count.index + 1}.yaml"
 }
 
-#resource "null_resource" "upload_cloud_init_alpaca" {
+resource "null_resource" "upload_cloud_init_alpaca" {
-#  count = var.alpaca_vm_count
+  count = var.alpaca_vm_count
-#
+
-#  connection {
+  connection {
-#    type = "ssh"
+    type = "ssh"
-#    user = "root"
+    user = "root"
-#    host = var.target_node
+    host = var.target_node
-#  }
+  }
-#
+
-#  provisioner "file" {
+  provisioner "file" {
-#    source      = local_file.cloud_init_alpaca[count.index].filename
+    source      = local_file.cloud_init_alpaca[count.index].filename
-#    destination = "/var/lib/vz/snippets/cloud_init_alpaca_${count.index + 1}.yaml"
+    destination = "/var/lib/vz/snippets/cloud_init_alpaca_${count.index + 1}.yaml"
-#  }
+  }
-#}
+}
 
 ### Llama cloud-init template
 data "template_file" "cloud_init_llama" {
@@ -38,6 +39,7 @@ data "template_file" "cloud_init_llama" {
   template = file("${path.module}/files/cloud_init.yaml")
 
   vars = {
+    ssh_key    = var.ssh_key
     hostname   = "llama-${count.index + 1}"
     domain     = "home.arpa"
     TS_AUTHKEY = var.TS_AUTHKEY
@@ -51,18 +53,18 @@ resource "local_file" "cloud_init_llama" {
   filename = "${path.module}/files/cloud_init_llama_${count.index + 1}.yaml"
 }
 
-#resource "null_resource" "upload_cloud_init_llama" {
+resource "null_resource" "upload_cloud_init_llama" {
-#  count = var.llama_vm_count
+  count = var.llama_vm_count
-#
+
-#  connection {
+  connection {
-#    type = "ssh"
+    type = "ssh"
-#    user = "root"
+    user = "root"
-#    host = var.target_node
+    host = var.target_node
-#  }
+  }
-#
+
-#  provisioner "file" {
+  provisioner "file" {
-#    source      = local_file.cloud_init_llama[count.index].filename
+    source      = local_file.cloud_init_llama[count.index].filename
-#    destination = "/var/lib/vz/snippets/cloud_init_llama_${count.index + 1}.yaml"
+    destination = "/var/lib/vz/snippets/cloud_init_llama_${count.index + 1}.yaml"
-#  }
+  }
-#}
+}
 

terraform/files/cloud_init.yaml

@@ -1,9 +1,10 @@
 #cloud-config
 hostname: ${hostname}
 fqdn: ${hostname}.${domain}
+ssh_authorized_keys:
+  - ${ssh_key}
 
 runcmd:
   - curl -fsSL https://tailscale.com/install.sh | sh
   - tailscale up --auth-key=${TS_AUTHKEY}
-  - tailscale set --ssh
 

terraform/files/cloud_init_base.yaml

@@ -1,9 +0,0 @@
-#cloud-config
-hostname: ${hostname}
-fqdn: ${hostname}.${domain}
-
-runcmd:
-  - curl -fsSL https://tailscale.com/install.sh | sh
-  - tailscale up --auth-key=${TS_AUTHKEY}
-  - tailscale set --ssh
-

terraform/main.tf

@@ -23,13 +23,14 @@ resource "proxmox_vm_qemu" "alpacas" {
   full_clone  = false
   agent       = 1
 
-  sockets   = var.sockets
+  sockets    = var.sockets
-  cores     = var.cores
+  cores      = var.cores
-  memory    = var.memory
+  memory     = var.memory
-  scsihw    = "virtio-scsi-pci"
+  scsihw     = "virtio-scsi-pci"
-  boot      = "order=scsi0"
+  boot       = "order=scsi0"
-  ipconfig0 = "ip=dhcp"
+  ipconfig0  = "ip=dhcp"
-  cicustom  = "user=local:snippets/cloud_init_alpaca_${count.index + 1}.yaml"
+  cicustom   = "user=local:snippets/cloud_init_alpaca_${count.index + 1}.yaml"
+  depends_on = [null_resource.upload_cloud_init_alpaca]
 
   disk {
     slot    = "scsi0"
@@ -55,13 +56,14 @@ resource "proxmox_vm_qemu" "llamas" {
   full_clone  = false
   agent       = 1
 
-  sockets   = var.sockets
+  sockets    = var.sockets
-  cores     = var.cores
+  cores      = var.cores
-  memory    = var.memory
+  memory     = var.memory
-  scsihw    = "virtio-scsi-pci"
+  scsihw     = "virtio-scsi-pci"
-  boot      = "order=scsi0"
+  boot       = "order=scsi0"
-  ipconfig0 = "ip=dhcp"
+  ipconfig0  = "ip=dhcp"
-  cicustom  = "user=local:snippets/cloud_init_llama_${count.index + 1}.yaml"
+  cicustom   = "user=local:snippets/cloud_init_llama_${count.index + 1}.yaml"
+  depends_on = [null_resource.upload_cloud_init_llama]
 
   disk {
     slot    = "scsi0"

terraform/terraform.tfstate

@@ -1,6 +1,6 @@
 {
   "version": 4,
-  "terraform_version": "1.8.3",
+  "terraform_version": "1.11.4",
   "serial": 31,
   "lineage": "7a39dd41-1655-172c-950b-b8c5398caf69",
   "outputs": {},

terraform/variables.tf

@@ -79,3 +79,9 @@ variable "TS_AUTHKEY" {
   description = "Tailscale auth key used in cloud-init"
 }
 
+
+variable "ssh_key" {
+  type        = string
+  description = "Public SSH key used by cloud-init"
+}
+