From 96f6d94c3a39a93eb1772df696049b198b471aa3 Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Thu, 17 Apr 2025 22:50:43 +0100 Subject: [PATCH] terraform fmt --- terraform/files/cloud_init_global.yaml | 17 +++++++++++++---- terraform/main.tf | 5 ++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/terraform/files/cloud_init_global.yaml b/terraform/files/cloud_init_global.yaml index a4d9277..bb5991d 100644 --- a/terraform/files/cloud_init_global.yaml +++ b/terraform/files/cloud_init_global.yaml @@ -2,8 +2,17 @@ hostname: ${hostname} fqdn: ${hostname}.${domain} -runcmd: - - curl -fsSL https://tailscale.com/install.sh | sh - - tailscale up --auth-key=${TS_AUTHKEY} - - tailscale set --ssh +#cloud-config +# The above header must generally appear on the first line of a cloud config +# file, but all other lines that begin with a # are optional comments. + +runcmd: + # One-command install, from https://tailscale.com/download/ + - ['sh', '-c', 'curl -fsSL https://tailscale.com/install.sh | sh'] + # Set sysctl settings for IP forwarding (useful when configuring an exit node) + - ['sh', '-c', "echo 'net.ipv4.ip_forward = 1' | sudo tee -a /etc/sysctl.d/99-tailscale.conf && echo 'net.ipv6.conf.all.forwarding = 1' | sudo tee -a /etc/sysctl.d/99-tailscale.conf && sudo sysctl -p /etc/sysctl.d/99-tailscale.conf" ] + # Generate an auth key from your Admin console + # https://login.tailscale.com/admin/settings/keys + # and replace the placeholder below + - ['tailscale', 'up', '--auth-key=${TS_AUTHKEY}'] diff --git a/terraform/main.tf b/terraform/main.tf index e6d38ff..d9edf7a 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -77,9 +77,8 @@ resource "proxmox_vm_qemu" "llamas" { scsi { scsi0 { disk { - size = var.disk_size - storage = var.storage - iothread = true + size = var.disk_size + storage = var.storage } } scsi1 {