From 73dd2e18ffdf2f36a3690c19e2501d3cf986b65c Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Fri, 18 Apr 2025 10:51:00 +0100 Subject: [PATCH] terraform fmt --- terraform/cloud-init.tf | 15 ++++++++++++++ terraform/files/cloud_init_global.yaml | 27 +++++++++++++++++++++++++- terraform/main.tf | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/terraform/cloud-init.tf b/terraform/cloud-init.tf index 18bffae..6c11712 100644 --- a/terraform/cloud-init.tf +++ b/terraform/cloud-init.tf @@ -15,3 +15,18 @@ resource "local_file" "cloud_init_global" { 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" +# } +#} diff --git a/terraform/files/cloud_init_global.yaml b/terraform/files/cloud_init_global.yaml index bb5991d..9d6ad29 100644 --- a/terraform/files/cloud_init_global.yaml +++ b/terraform/files/cloud_init_global.yaml @@ -1,5 +1,30 @@ #cloud-config -hostname: ${hostname} + +package_update: true +package_upgrade: true + +# APT fails to acquire GPG keys if package dirmngr is missing +bootcmd: + - [ cloud-init-per, once, dirmngr-aptupdate, apt-get, update ] + - [ cloud-init-per, once, dirmngr-aptinstall, apt-get, install, dirmngr, -y ] + - [ cloud-init-per, once, dirmngr-aptinstall, apt-get, install, gnupg2, -y ] + +packages: + - jq + - curl + - qemu-guest-agent + - salt-minion + +users: +- name: stuart + groups: sudo + shell: /bin/bash + sudo: ['ALL=(ALL) NOPASSWD:ALL'] + ssh_authorized_keys: + - ${ssh_key} + +preserve_hostname: false +manage_etc_hosts: false fqdn: ${hostname}.${domain} #cloud-config diff --git a/terraform/main.tf b/terraform/main.tf index d9edf7a..9e6e2ee 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -21,6 +21,7 @@ resource "proxmox_vm_qemu" "alpacas" { target_node = var.target_node clone = var.clone_template full_clone = true + os_type = "cloud-init" agent = 1 sockets = var.sockets @@ -63,6 +64,7 @@ resource "proxmox_vm_qemu" "llamas" { target_node = var.target_node clone = var.clone_template full_clone = true + os_type = "cloud-init" agent = 1 sockets = var.sockets