Merge pull request 'terraform apply' (#2) from stage into master

Reviewed-on: #2

.gitea/workflows/terraform-apply.yml

@@ -1,5 +1,5 @@
 name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is deploying with Terraform 🚀
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
 
 on:
   push:
@@ -15,10 +15,6 @@ jobs:
       contents: read
       pull-requests: write
 
-    env:
-      TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
-      TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -37,6 +33,7 @@ jobs:
         working-directory: terraform
         run: terraform init
 
+
       - name: Terraform Plan
         working-directory: terraform
         run: terraform plan 

.gitea/workflows/terraform-destroy.yml

@@ -1,43 +0,0 @@
-name: Gitea Destroy Terraform
-run-name: ${{ gitea.actor }} triggered a Terraform Destroy 🧨
-
-on:
-  push:
-    branches:
-      - destroy
-
-jobs:
-  destroy:
-    name: "Terraform Destroy"
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      pull-requests: write
-
-    env:
-      TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
-      TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Terraform
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_version: 1.6.6
-
-      - name: Inject sensitive secrets
-        working-directory: terraform
-        run: |
-          echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars
-
-      - name: Terraform Init
-        working-directory: terraform
-        run: terraform init
-
-      - name: Terraform Destroy
-        working-directory: terraform
-        run: terraform destroy -auto-approve
-

.gitea/workflows/terraform-plan.yml

@@ -16,12 +16,6 @@ jobs:
       contents: read
       pull-requests: write
 
-    env:
-      TF_VAR_TAILSCALE_KEY: ${{ secrets.TAILSCALE_KEY }}
-      TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
-      TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
-
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

terraform/.terraform.lock.hcl

@@ -1,61 +1,6 @@
 # This file is maintained automatically by "terraform init".
 # Manual edits may be lost in future updates.
 
-provider "registry.terraform.io/hashicorp/local" {
-  version = "2.5.2"
-  hashes = [
-    "h1:JlMZD6nYqJ8sSrFfEAH0Vk/SL8WLZRmFaMUF9PJK5wM=",
-    "zh:136299545178ce281c56f36965bf91c35407c11897f7082b3b983d86cb79b511",
-    "zh:3b4486858aa9cb8163378722b642c57c529b6c64bfbfc9461d940a84cd66ebea",
-    "zh:4855ee628ead847741aa4f4fc9bed50cfdbf197f2912775dd9fe7bc43fa077c0",
-    "zh:4b8cd2583d1edcac4011caafe8afb7a95e8110a607a1d5fb87d921178074a69b",
-    "zh:52084ddaff8c8cd3f9e7bcb7ce4dc1eab00602912c96da43c29b4762dc376038",
-    "zh:71562d330d3f92d79b2952ffdda0dad167e952e46200c767dd30c6af8d7c0ed3",
-    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:805f81ade06ff68fa8b908d31892eaed5c180ae031c77ad35f82cb7a74b97cf4",
-    "zh:8b6b3ebeaaa8e38dd04e56996abe80db9be6f4c1df75ac3cccc77642899bd464",
-    "zh:ad07750576b99248037b897de71113cc19b1a8d0bc235eb99173cc83d0de3b1b",
-    "zh:b9f1c3bfadb74068f5c205292badb0661e17ac05eb23bfe8bd809691e4583d0e",
-    "zh:cc4cbcd67414fefb111c1bf7ab0bc4beb8c0b553d01719ad17de9a047adff4d1",
-  ]
-}
-
-provider "registry.terraform.io/hashicorp/null" {
-  version = "3.2.3"
-  hashes = [
-    "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=",
-    "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2",
-    "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d",
-    "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3",
-    "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f",
-    "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1",
-    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301",
-    "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670",
-    "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed",
-    "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65",
-    "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd",
-    "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5",
-  ]
-}
-
-provider "registry.terraform.io/hashicorp/template" {
-  version = "2.2.0"
-  hashes = [
-    "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=",
-    "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386",
-    "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53",
-    "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603",
-    "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16",
-    "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776",
-    "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451",
-    "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae",
-    "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde",
-    "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d",
-    "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2",
-  ]
-}
-
 provider "registry.terraform.io/telmate/proxmox" {
   version     = "3.0.1-rc8"
   constraints = "3.0.1-rc8"

terraform/cloud-init.tf

@@ -1,70 +0,0 @@
-### Alpaca cloud-init template
-data "template_file" "cloud_init_alpaca" {
-  count    = var.alpaca_vm_count
-  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
-  }
-}
-
-
-resource "local_file" "cloud_init_alpaca" {
-  count    = var.alpaca_vm_count
-  content  = data.template_file.cloud_init_alpaca[count.index].rendered
-  filename = "${path.module}/files/cloud_init_alpaca_${count.index + 1}.yaml"
-}
-
-resource "null_resource" "upload_cloud_init_alpaca" {
-  count = var.alpaca_vm_count
-
-  connection {
-    type = "ssh"
-    user = "root"
-    host = var.target_node
-  }
-
-  provisioner "file" {
-    source      = local_file.cloud_init_alpaca[count.index].filename
-    destination = "/var/lib/vz/snippets/cloud_init_alpaca_${count.index + 1}.yaml"
-  }
-}
-
-### Llama cloud-init template
-data "template_file" "cloud_init_llama" {
-  count    = var.llama_vm_count
-  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
-  }
-}
-
-
-resource "local_file" "cloud_init_llama" {
-  count    = var.llama_vm_count
-  content  = data.template_file.cloud_init_llama[count.index].rendered
-  filename = "${path.module}/files/cloud_init_llama_${count.index + 1}.yaml"
-}
-
-resource "null_resource" "upload_cloud_init_llama" {
-  count = var.llama_vm_count
-
-  connection {
-    type = "ssh"
-    user = "root"
-    host = var.target_node
-  }
-
-  provisioner "file" {
-    source      = local_file.cloud_init_llama[count.index].filename
-    destination = "/var/lib/vz/snippets/cloud_init_llama_${count.index + 1}.yaml"
-  }
-}
-

terraform/files/cloud_init.yaml

@@ -1,10 +0,0 @@
-#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}
-

terraform/main.tf

@@ -15,28 +15,22 @@ provider "proxmox" {
 }
 
 resource "proxmox_vm_qemu" "alpacas" {
-  count       = var.alpaca_vm_count
+  count       = var.alpaca_count
+  vmid        = 500 + count.index
   name        = "alpaca-${count.index + 1}"
-  vmid        = 500 + count.index + 1
   target_node = var.target_node
   clone       = var.clone_template
-  full_clone  = false
-  agent       = 1
-
   sockets     = var.sockets
   cores       = var.cores
   memory      = var.memory
-  scsihw     = "virtio-scsi-pci"
+  agent       = 1
   boot        = "order=scsi0"
-  ipconfig0  = "ip=dhcp"
-  cicustom   = "user=local:snippets/cloud_init_alpaca_${count.index + 1}.yaml"
-  depends_on = [null_resource.upload_cloud_init_alpaca]
 
   disk {
     slot    = "scsi0"
     type    = "disk"
-    storage = var.storage
     size    = var.disk_size
+    storage = var.storage
   }
 
   network {
@@ -46,30 +40,23 @@ resource "proxmox_vm_qemu" "alpacas" {
   }
 }
 
-
 resource "proxmox_vm_qemu" "llamas" {
-  count       = var.llama_vm_count
+  count       = var.llama_count
+  vmid        = 600 + count.index
   name        = "llama-${count.index + 1}"
-  vmid        = 600 + count.index + 1
   target_node = var.target_node
   clone       = var.clone_template
-  full_clone  = false
-  agent       = 1
-
   sockets     = var.sockets
   cores       = var.cores
   memory      = var.memory
-  scsihw     = "virtio-scsi-pci"
+  agent       = 1
   boot        = "order=scsi0"
-  ipconfig0  = "ip=dhcp"
-  cicustom   = "user=local:snippets/cloud_init_llama_${count.index + 1}.yaml"
-  depends_on = [null_resource.upload_cloud_init_llama]
 
   disk {
     slot    = "scsi0"
     type    = "disk"
-    storage = var.storage
     size    = var.disk_size
+    storage = var.storage
   }
 
   network {
@@ -79,3 +66,4 @@ resource "proxmox_vm_qemu" "llamas" {
   }
 }
 
+

terraform/terraform.tfstate

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

terraform/terraform.tfstate.backup

@@ -1,23 +1,12 @@
 {
   "version": 4,
   "terraform_version": "1.11.4",
-  "serial": 28,
+  "serial": 23,
   "lineage": "7a39dd41-1655-172c-950b-b8c5398caf69",
   "outputs": {
-    "alpaca_vm_ids": {
+    "vm_clones": {
-      "value": {
-        "alpaca-1": 501
-      },
-      "type": [
-        "object",
-        {
-          "alpaca-1": "number"
-        }
-      ]
-    },
-    "alpaca_vm_names": {
       "value": [
-        "alpaca-1"
+        "Alpine-Template"
       ],
       "type": [
         "tuple",
@@ -26,20 +15,20 @@
         ]
       ]
     },
-    "llama_vm_ids": {
+    "vm_ids": {
       "value": {
-        "llama-1": 601
+        "Alpine-1": 400
       },
       "type": [
         "object",
         {
-          "llama-1": "number"
+          "Alpine-1": "number"
         }
       ]
     },
-    "llama_vm_names": {
+    "vm_names": {
       "value": [
-        "llama-1"
+        "Alpine-1"
       ],
       "type": [
         "tuple",
@@ -53,7 +42,7 @@
     {
       "mode": "managed",
       "type": "proxmox_vm_qemu",
-      "name": "alpacas",
+      "name": "alpine",
       "provider": "provider[\"registry.terraform.io/telmate/proxmox\"]",
       "instances": [
         {
@@ -128,7 +117,7 @@
             "hastate": "",
             "hostpci": [],
             "hotplug": "network,disk,usb",
-            "id": "flex/qemu/501",
+            "id": "flex/qemu/400",
             "ipconfig0": null,
             "ipconfig1": null,
             "ipconfig10": null,
@@ -149,7 +138,7 @@
             "linked_vmid": 0,
             "machine": "",
             "memory": 2048,
-            "name": "alpaca-1",
+            "name": "Alpine-1",
             "nameserver": null,
             "network": [
               {
@@ -157,7 +146,7 @@
                 "firewall": false,
                 "id": 0,
                 "link_down": false,
-                "macaddr": "bc:24:11:9a:b0:73",
+                "macaddr": "bc:24:11:42:6e:29",
                 "model": "virtio",
                 "mtu": 0,
                 "queues": 0,
@@ -188,7 +177,7 @@
                 "product": "",
                 "serial": "",
                 "sku": "",
-                "uuid": "9bb69618-0076-490d-95fe-c762e09d5326",
+                "uuid": "7e462704-9013-4e96-9652-37e66a7cdf5f",
                 "version": ""
               }
             ],
@@ -212,189 +201,7 @@
             "vcpus": 0,
             "vga": [],
             "vm_state": "running",
-            "vmid": 501
+            "vmid": 400
-          },
-          "sensitive_attributes": [
-            [
-              {
-                "type": "get_attr",
-                "value": "ssh_private_key"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "cipassword"
-              }
-            ]
-          ],
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxMjAwMDAwMDAwMDAwLCJkZWZhdWx0IjoxMjAwMDAwMDAwMDAwLCJkZWxldGUiOjEyMDAwMDAwMDAwMDAsInJlYWQiOjEyMDAwMDAwMDAwMDAsInVwZGF0ZSI6MTIwMDAwMDAwMDAwMH19"
-        }
-      ]
-    },
-    {
-      "mode": "managed",
-      "type": "proxmox_vm_qemu",
-      "name": "llamas",
-      "provider": "provider[\"registry.terraform.io/telmate/proxmox\"]",
-      "instances": [
-        {
-          "index_key": 0,
-          "schema_version": 0,
-          "attributes": {
-            "additional_wait": 5,
-            "agent": 1,
-            "agent_timeout": 90,
-            "args": "",
-            "automatic_reboot": true,
-            "balloon": 0,
-            "bios": "seabios",
-            "boot": "order=scsi0",
-            "bootdisk": "",
-            "ci_wait": null,
-            "cicustom": null,
-            "cipassword": "",
-            "ciupgrade": false,
-            "ciuser": "",
-            "clone": "Alpine-Template",
-            "clone_id": null,
-            "clone_wait": 10,
-            "cores": 2,
-            "cpu": null,
-            "cpu_type": "host",
-            "current_node": "flex",
-            "default_ipv4_address": "",
-            "default_ipv6_address": "",
-            "define_connection_info": true,
-            "desc": "Managed by Terraform.",
-            "disk": [
-              {
-                "asyncio": "",
-                "backup": true,
-                "cache": "",
-                "discard": false,
-                "disk_file": "",
-                "emulatessd": false,
-                "format": "raw",
-                "id": 0,
-                "iops_r_burst": 0,
-                "iops_r_burst_length": 0,
-                "iops_r_concurrent": 0,
-                "iops_wr_burst": 0,
-                "iops_wr_burst_length": 0,
-                "iops_wr_concurrent": 0,
-                "iothread": false,
-                "iso": "",
-                "linked_disk_id": -1,
-                "mbps_r_burst": 0,
-                "mbps_r_concurrent": 0,
-                "mbps_wr_burst": 0,
-                "mbps_wr_concurrent": 0,
-                "passthrough": false,
-                "readonly": false,
-                "replicate": false,
-                "serial": "",
-                "size": "15G",
-                "slot": "scsi0",
-                "storage": "Flash",
-                "type": "disk",
-                "wwn": ""
-              }
-            ],
-            "disks": [],
-            "efidisk": [],
-            "force_create": false,
-            "force_recreate_on_change_of": null,
-            "full_clone": true,
-            "hagroup": "",
-            "hastate": "",
-            "hostpci": [],
-            "hotplug": "network,disk,usb",
-            "id": "flex/qemu/601",
-            "ipconfig0": null,
-            "ipconfig1": null,
-            "ipconfig10": null,
-            "ipconfig11": null,
-            "ipconfig12": null,
-            "ipconfig13": null,
-            "ipconfig14": null,
-            "ipconfig15": null,
-            "ipconfig2": null,
-            "ipconfig3": null,
-            "ipconfig4": null,
-            "ipconfig5": null,
-            "ipconfig6": null,
-            "ipconfig7": null,
-            "ipconfig8": null,
-            "ipconfig9": null,
-            "kvm": true,
-            "linked_vmid": 0,
-            "machine": "",
-            "memory": 2048,
-            "name": "llama-1",
-            "nameserver": null,
-            "network": [
-              {
-                "bridge": "vmbr0",
-                "firewall": false,
-                "id": 0,
-                "link_down": false,
-                "macaddr": "bc:24:11:16:44:6b",
-                "model": "virtio",
-                "mtu": 0,
-                "queues": 0,
-                "rate": 0,
-                "tag": 0
-              }
-            ],
-            "numa": false,
-            "onboot": false,
-            "os_network_config": null,
-            "os_type": "cloud-init",
-            "pci": [],
-            "pcis": [],
-            "pool": "",
-            "protection": false,
-            "pxe": null,
-            "qemu_os": "l26",
-            "reboot_required": false,
-            "scsihw": "lsi",
-            "searchdomain": null,
-            "serial": [],
-            "skip_ipv4": false,
-            "skip_ipv6": false,
-            "smbios": [
-              {
-                "family": "",
-                "manufacturer": "",
-                "product": "",
-                "serial": "",
-                "sku": "",
-                "uuid": "99429525-6c01-4278-83cc-f6ebdb348577",
-                "version": ""
-              }
-            ],
-            "sockets": 1,
-            "ssh_forward_ip": null,
-            "ssh_host": "",
-            "ssh_port": "22",
-            "ssh_private_key": null,
-            "ssh_user": null,
-            "sshkeys": null,
-            "startup": "",
-            "tablet": true,
-            "tags": "",
-            "target_node": "flex",
-            "target_nodes": null,
-            "timeouts": null,
-            "tpm_state": [],
-            "unused_disk": [],
-            "usb": [],
-            "usbs": [],
-            "vcpus": 0,
-            "vga": [],
-            "vm_state": "running",
-            "vmid": 601
           },
           "sensitive_attributes": [
             [

terraform/terraform.tfvars

@@ -1,5 +1,5 @@
 target_node    = "flex"
-clone_template = "Alpine-TemplateV2"
+clone_template = "Alpine-Template"
 vm_name        = "alpine-vm"
 cores          = 2
 memory         = 2048

terraform/variables.tf

@@ -62,26 +62,3 @@ variable "llama_count" {
   description = "How many Llama VMs to create"
 }
 
-variable "alpaca_vm_count" {
-  type        = number
-  default     = 1
-  description = "How many Alpaca VMs to create"
-}
-
-variable "llama_vm_count" {
-  type        = number
-  default     = 1
-  description = "How many Llama VMs to create"
-}
-
-variable "TS_AUTHKEY" {
-  type        = string
-  description = "Tailscale auth key used in cloud-init"
-}
-
-
-variable "ssh_key" {
-  type        = string
-  description = "Public SSH key used by cloud-init"
-}
-