From be720005b506b1e4538418309fd0582a049029e0 Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Sat, 20 Jul 2024 10:33:58 -0400 Subject: [PATCH] fixing tf --- terraform/.terraform.lock.hcl | 42 ++++++++++++++++++++++++++++++++++ terraform/AI.tf | 1 + terraform/arrbuntu.tf | 1 + terraform/cloud-init.tf | 3 +-- terraform/docker-runner.tf | 1 + terraform/docker-runner2.tf | 1 + terraform/downloaders.tf | 1 + terraform/k3s-master.tf | 1 + terraform/k3s-master2.tf | 1 + terraform/k3s-master3.tf | 1 + terraform/kasm.tf | 1 + terraform/nexus.tf | 1 + terraform/npm.tf | 1 + terraform/runner.tf | 1 + terraform/ubuntu22-template.tf | 2 +- terraform/whisper.tf | 1 + 16 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 terraform/.terraform.lock.hcl diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl new file mode 100644 index 0000000..49ac711 --- /dev/null +++ b/terraform/.terraform.lock.hcl @@ -0,0 +1,42 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/bpg/proxmox" { + version = "0.61.1" + constraints = ">= 0.60.1" + hashes = [ + "h1:6kz2Rdjc8+TVq2aUxEQXLOwbb9OdhJJei0L1fC4K2R4=", + "zh:27d8b589a2dc1e0a5b0f8ab299b9f3704a2f0b69799d1d4d8845c68056986d1f", + "zh:46dfa6b33ddd7007a2144f38090457604eb56a59a303b37bb0ad1be5c84ddaca", + "zh:47a1b14a759393c5ecc76f2feb950677c418c910b8c677fde0dd3e4675c41579", + "zh:582e49d109d1c2b1f3b1268a7cbc43548f3c6d96a87c92a5428767097a5e383e", + "zh:5e98ad6afae5969a4c3ffb14c0484936550c66c8313d7686551c29b633ff32f2", + "zh:7b9e24b76f947ab8f1e571cf61beefc983b7d2aa1b85df35c4f015728fe37a38", + "zh:8255ca210f279a0f7b8ca2762df26d2ea1a01704298c5e3d5cf601bd39a743f0", + "zh:85d7655fdc95dedced9cf8105a0beeb0d7bc8f668c55f62019a7215a76d60300", + "zh:8aeea5a1d001b06baaf923b754e1a14d06c75eb8c8b87a7f65a3c8205fc8b079", + "zh:a9cfab6c06f613658c5fdd83742cd22c0eb7563778924b1407965ef8c36c1ce0", + "zh:ceaab67801d49a92eb5858b1ddae6df2569462e5ffbe31f9dbd79dcb684ea142", + "zh:dc25b506d5c55d1d78a335d3ebd03213c99b4b2a5859812349a955c2f746ff7e", + "zh:e04b477fd77a0d37a0bdb76a7cf69184dad9e7fbba9b4f3a378a8901b82b75e5", + "zh:f1e6838d9141557f73340df9b21fce5a82b41cc16ae36f063a920ccc36bc0758", + "zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597", + ] +} + +provider "registry.opentofu.org/hashicorp/local" { + version = "2.5.1" + hashes = [ + "h1:GgW5qncKu4KnXLE1ZYv5iwmhSYtTNzsOvJAOQIyFR7E=", + "zh:031c2c2070672b7e78e0aa15560839278dc57fe7cf1e58a617ac13c67b31d5fb", + "zh:1ef64ea4f8382cd538a76f3d319f405d18130dc3280f1c16d6aaa52a188ecaa4", + "zh:422ce45691b2f384dbd4596fdc8209d95cb43d85a82aaa0173089d38976d6e96", + "zh:7415fbd8da72d9363ba55dd8115837714f9534f5a9a518ec42268c2da1b9ed2f", + "zh:92aa22d071339c8ef595f18a9f9245c287266c80689f5746b26e10eaed04d542", + "zh:9cd0d99f5d3be835d6336c19c4057af6274e193e677ecf6370e5b0de12b4aafe", + "zh:a8c1525b389be5809a97f02aa7126e491ba518f97f57ed3095a3992f2134bb8f", + "zh:b336fa75f72643154b07c09b3968e417a41293358a54fe03efc0db715c5451e6", + "zh:c66529133599a419123ad2e42874afbd9aba82bd1de2b15cc68d2a1e665d4c8e", + "zh:c7568f75ba6cb7c3660b69eaab8b0e4278533bd9a7a4c33ee6590cc7e69743ea", + ] +} diff --git a/terraform/AI.tf b/terraform/AI.tf index 31204c3..0d33da1 100644 --- a/terraform/AI.tf +++ b/terraform/AI.tf @@ -65,6 +65,7 @@ resource "proxmox_virtual_environment_vm" "AI" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/arrbuntu.tf b/terraform/arrbuntu.tf index cccb19e..e1020ea 100644 --- a/terraform/arrbuntu.tf +++ b/terraform/arrbuntu.tf @@ -60,6 +60,7 @@ resource "proxmox_virtual_environment_vm" "Arrbuntu" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/cloud-init.tf b/terraform/cloud-init.tf index c3faf7e..e4dc755 100644 --- a/terraform/cloud-init.tf +++ b/terraform/cloud-init.tf @@ -61,8 +61,7 @@ resource "proxmox_virtual_environment_file" "cloud_config2" { - systemctl enable qemu-guest-agent - systemctl start qemu-guest-agent - curl -fsSL https://get.docker.com | sudo sh - - su - mafyuh -c 'git clone https://git.mafyuh.dev/mafyuh/IaC-Homelab.git /home/mafyuh/IaC-Homelab' - - su - mafyuh -c 'git clone https://git.mafyuh.dev/mafyuh/Auto-Homelab.git /home/mafyuh/Auto-Homelab' + - su - mafyuh -c 'git clone https://git.mafyuh.dev/mafyuh/iac.git /home/mafyuh/iac' - su - mafyuh -c 'git config --global user.name "Mafyuh"' - su - mafyuh -c 'git config --global user.email "matt@mafyuh.com"' - echo "done" > /tmp/cloud-config.done diff --git a/terraform/docker-runner.tf b/terraform/docker-runner.tf index 437c5e4..8c04f5f 100644 --- a/terraform/docker-runner.tf +++ b/terraform/docker-runner.tf @@ -58,6 +58,7 @@ resource "proxmox_virtual_environment_vm" "Docker-Runner" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/docker-runner2.tf b/terraform/docker-runner2.tf index 47a00ee..b7fbc0d 100644 --- a/terraform/docker-runner2.tf +++ b/terraform/docker-runner2.tf @@ -58,6 +58,7 @@ resource "proxmox_virtual_environment_vm" "Docker-Runner2" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/downloaders.tf b/terraform/downloaders.tf index 8d6b028..6fbfe42 100644 --- a/terraform/downloaders.tf +++ b/terraform/downloaders.tf @@ -60,6 +60,7 @@ resource "proxmox_virtual_environment_vm" "Downloaders" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/k3s-master.tf b/terraform/k3s-master.tf index 64b1769..a3a59bb 100644 --- a/terraform/k3s-master.tf +++ b/terraform/k3s-master.tf @@ -59,6 +59,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/k3s-master2.tf b/terraform/k3s-master2.tf index a7e54a8..64da7eb 100644 --- a/terraform/k3s-master2.tf +++ b/terraform/k3s-master2.tf @@ -59,6 +59,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master2" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/k3s-master3.tf b/terraform/k3s-master3.tf index e857f92..de08861 100644 --- a/terraform/k3s-master3.tf +++ b/terraform/k3s-master3.tf @@ -59,6 +59,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master3" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/kasm.tf b/terraform/kasm.tf index 8650051..c5cd0c8 100644 --- a/terraform/kasm.tf +++ b/terraform/kasm.tf @@ -56,6 +56,7 @@ resource "proxmox_virtual_environment_vm" "Kasm" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/nexus.tf b/terraform/nexus.tf index 79ccf75..99d174e 100644 --- a/terraform/nexus.tf +++ b/terraform/nexus.tf @@ -58,6 +58,7 @@ resource "proxmox_virtual_environment_vm" "Nexus" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/npm.tf b/terraform/npm.tf index bc1a381..0757653 100644 --- a/terraform/npm.tf +++ b/terraform/npm.tf @@ -60,6 +60,7 @@ resource "proxmox_virtual_environment_vm" "NPM" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/runner.tf b/terraform/runner.tf index 1bee987..9cab0c9 100644 --- a/terraform/runner.tf +++ b/terraform/runner.tf @@ -58,6 +58,7 @@ resource "proxmox_virtual_environment_vm" "Runner" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] } diff --git a/terraform/ubuntu22-template.tf b/terraform/ubuntu22-template.tf index a8b7203..1a473d0 100644 --- a/terraform/ubuntu22-template.tf +++ b/terraform/ubuntu22-template.tf @@ -44,5 +44,5 @@ resource "proxmox_virtual_environment_download_file" "ubuntu_cloud_image_22" { content_type = "iso" datastore_id = "local" node_name = "prox" - url = "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img" + url = "https://cloud-images.ubuntu.com/jammy/20240720/jammy-server-cloudimg-amd64.img" } diff --git a/terraform/whisper.tf b/terraform/whisper.tf index ff5a4de..a0a406c 100644 --- a/terraform/whisper.tf +++ b/terraform/whisper.tf @@ -69,6 +69,7 @@ resource "proxmox_virtual_environment_vm" "Whisper" { initialization[0].user_account[0].keys, initialization[0].user_account[0].password, initialization[0].user_account[0].username, + initialization[0].user_data_file_id ] }