Merge pull request 'stage' (#18) from stage into master

Reviewed-on: #18

.gitea/workflows/terraform-apply.yml

@@ -17,7 +17,8 @@ jobs:
 
     env:
       TF_VAR_SSH_KEY_PUBLIC: ${{ secrets.SSH_KEY_PUBLIC }}
-      TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
+      TF_VAR_TS_AUTHKEY: ${{ secrets.TS_AUTHKEY }}
+      TF_VAR_proxmox_password: ${{ secrets.PROXMOX_PASSWORD }}
 
     steps:
       - name: Checkout repository
@@ -28,12 +29,6 @@ jobs:
         with:
           terraform_version: 1.6.6
 
-      - name: Inject sensitive secrets
-        working-directory: terraform
-        run: |
-          echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars
-          echo 'SSH_KEY_PUBLIC = "${{ secrets.SSH_KEY_PUBLIC }}"' >> terraform.tfvars
-
       - name: Terraform Init
         working-directory: terraform
         run: terraform init

.gitea/workflows/terraform-destroy.yml

@@ -14,9 +14,9 @@ jobs:
       pull-requests: write
 
     env:
-        TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY }}
+      TF_VAR_SSH_KEY: ${{ secrets.TF_VAR_SSH_KEY_PUBLIC }}
-        TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
+      TF_VAR_TS_AUTHKEY: ${{ secrets.TF_VAR_TS_AUTHKEY }}
-        TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }}
+      TF_VAR_PROXMOX_PASSWORD: ${{ secrets.TF_VAR_PROXMOX_PASSWORD }}
 
 
     steps:
@@ -28,11 +28,6 @@ jobs:
         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

.gitea/workflows/terraform-plan.yml

@@ -17,8 +17,9 @@ jobs:
       pull-requests: write
 
     env:
-      TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY_PUBLIC }}
+      TF_VAR_SSH_KEY_PUBLIC: ${{ secrets.SSH_KEY_PUBLIC }}
-      TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }}
+      TF_VAR_TS_AUTHKEY: ${{ secrets.TS_AUTHKEY }}
+      TF_VAR_proxmox_password: ${{ secrets.PROXMOX_PASSWORD }}
 
     steps:
       - name: Checkout repository
@@ -29,12 +30,6 @@ jobs:
         with:
           terraform_version: 1.6.6
 
-      - name: Inject sensitive secrets
-        working-directory: terraform
-        run: |
-          echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars
-          echo 'SSH_KEY_PUBLIC = "${{ secrets.SSH_KEY_PUBLIC }}"' >> terraform.tfvars
-
       - name: Terraform Init
         working-directory: terraform
         run: terraform init

.gitignore

@@ -1,2 +1,6 @@
 ./terraform/.terraform
 terraform/.terraform/
+terraform/test-apply.sh
+terraform/test-plan.sh
+terraform/test-destroy.sh
+terraform/tfplan

terraform/.terraform.lock.hcl

@@ -20,25 +20,6 @@ provider "registry.terraform.io/hashicorp/local" {
   ]
 }
 
-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 = [

terraform/cloud-init.tf

@@ -4,9 +4,10 @@ data "template_file" "cloud_init_global" {
   template = file("${path.module}/files/cloud_init_global.yaml")
 
   vars = {
-    hostname   = "generic"
+    hostname       = "generic"
-    domain     = "home.arpa"
+    domain         = "home.arpa"
-    TS_AUTHKEY = var.TS_AUTHKEY
+    TS_AUTHKEY     = var.TS_AUTHKEY
+    SSH_KEY_PUBLIC = var.SSH_KEY_PUBLIC
   }
 }
 
@@ -14,19 +15,3 @@ resource "local_file" "cloud_init_global" {
   content  = data.template_file.cloud_init_global.rendered
   filename = "${path.module}/files/cloud_init_global.yaml"
 }
-
-#resource "null_resource" "upload_cloud_init_alpaca" {
-#  count = var.alpaca_vm_count
-#
-#  connection {
-#    type = "ssh"
-#    user = "root"
-#    private_key = var.ssh_key
-#    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"
-#  }
-#}

terraform/files/cloud_init_global.yaml

@@ -1,4 +1,11 @@
 #cloud-config
+#cloud-config
+hostname: myvm
+manage_etc_hosts: true
+resolv_conf:
+  nameservers:
+    - 8.8.8.8
+    - 1.1.1.1
 
 package_update: true
 package_upgrade: true
@@ -13,7 +20,6 @@ packages:
   - jq
   - curl
   - qemu-guest-agent
-  - salt-minion
 
 users:
 - name: stuart
@@ -24,7 +30,6 @@ users:
     - ${SSH_KEY_PUBLIC}
 
 preserve_hostname: false
-manage_etc_hosts: false
 fqdn: ${hostname}.${domain}
 
 #cloud-config

terraform/main.tf

@@ -28,20 +28,24 @@ resource "proxmox_vm_qemu" "alpacas" {
   cores     = var.cores
   memory    = var.memory
   scsihw    = "virtio-scsi-pci"
-  boot      = "order=scsi0"
+  boot      = "order=virtio0"
+  bootdisk  = "virtio0"
   ipconfig0 = "ip=dhcp"
   cicustom  = "user=local:snippets/cloud_init_global.yaml"
 
 
   disks {
-    scsi {
+    virtio {
-      scsi0 {
+      virtio0 {
         disk {
           size    = var.disk_size
           storage = var.storage
         }
       }
-      scsi1 {
+    }
+
+    ide {
+      ide2 {
         cloudinit {
           storage = var.storage
         }
@@ -71,19 +75,23 @@ resource "proxmox_vm_qemu" "llamas" {
   cores     = var.cores
   memory    = var.memory
   scsihw    = "virtio-scsi-pci"
-  boot      = "order=scsi0"
+  boot      = "order=virtio0"
+  bootdisk  = "virtio0"
   ipconfig0 = "ip=dhcp"
   cicustom  = "user=local:snippets/cloud_init_global.yaml"
 
   disks {
-    scsi {
+    virtio {
-      scsi0 {
+      virtio0 {
         disk {
           size    = var.disk_size
           storage = var.storage
         }
       }
-      scsi1 {
+    }
+
+    ide {
+      ide2 {
         cloudinit {
           storage = var.storage
         }
@@ -91,6 +99,7 @@ resource "proxmox_vm_qemu" "llamas" {
     }
   }
 
+
   network {
     id     = 0
     model  = "virtio"

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/terraform.tfvars

@@ -10,4 +10,3 @@ disk_type      = "scsi"
 storage        = "Flash"
 pm_api_url     = "https://100.105.0.115:8006/api2/json"
 pm_user        = "terraform-prov@pve"
-

terraform/variables.tf

@@ -79,7 +79,7 @@ variable "TS_AUTHKEY" {
   description = "Tailscale auth key used in cloud-init"
 }
 
-variable "SSK_KEY_PUBLIC" {
+variable "SSH_KEY_PUBLIC" {
   type        = string
   description = "My Public SSH key fo ssh auth list"
 }