From 7317e390c9ff1fd6e3ae797760938cf5957ea3fe Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Mon, 20 Oct 2025 11:27:00 +0200 Subject: [PATCH] update main.tf to match simpler UEFI firmware logic --- environments/debian-13-cloud/main.tf | 10 +--------- environments/fedora-cloud-server-42-bios/main.tf | 2 +- environments/opensuse-tumbleweed-uefi/main.tf | 9 +-------- environments/phyllome-42-uefi/main.tf | 8 +------- environments/rocky-linux-cloud-10-bios/main.tf | 2 +- environments/ubuntu-cloud-server-2404-bios/main.tf | 2 +- environments/ubuntu-cloud-server-2404-uefi/main.tf | 11 ++--------- 7 files changed, 8 insertions(+), 36 deletions(-) diff --git a/environments/debian-13-cloud/main.tf b/environments/debian-13-cloud/main.tf index 34238dc..bd1a095 100644 --- a/environments/debian-13-cloud/main.tf +++ b/environments/debian-13-cloud/main.tf @@ -17,14 +17,6 @@ module "shared_modules" { vm_name = "deb-13-bios" image_location = "https://cloud.debian.org/images/cloud/trixie/latest/debian-13-genericcloud-amd64.raw" - ssh_key = "" + ssh_key = "" # please provide a SSH public key enable_cloudinit = true - # ---- UEFI SETTINGS ---------------------------------------------- - # uefi_firmware = "/usr/share/edk2/ovmf/OVMF_CODE.fd" # Location on Fedora - # uefi_nvram_template = "/usr/share/edk2/ovmf/OVMF_VARS.fd" # Location on Fedora - uefi_firmware = "/usr/share/edk2/x64/OVMF_CODE.4m.fd" # Location on Arch Linux - uefi_nvram_template = "/usr/share/edk2/x64/OVMF_VARS.4m.fd" # Location on Arch Linux - uefi_nvram_file_suffix = "-uefi" - # ---------------------------------------------------------------- - } \ No newline at end of file diff --git a/environments/fedora-cloud-server-42-bios/main.tf b/environments/fedora-cloud-server-42-bios/main.tf index 61979c3..06b86e6 100644 --- a/environments/fedora-cloud-server-42-bios/main.tf +++ b/environments/fedora-cloud-server-42-bios/main.tf @@ -17,6 +17,6 @@ module "shared_modules" { vm_name = "f42-bios" image_location = "https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2" - ssh_key = "" + ssh_key = "" # please provide a SSH public key enable_cloudinit = true } \ No newline at end of file diff --git a/environments/opensuse-tumbleweed-uefi/main.tf b/environments/opensuse-tumbleweed-uefi/main.tf index 9c7537c..1efe629 100644 --- a/environments/opensuse-tumbleweed-uefi/main.tf +++ b/environments/opensuse-tumbleweed-uefi/main.tf @@ -17,14 +17,7 @@ module "shared_modules" { vm_name = "os-tw-uefi" image_location = "https://download.opensuse.org/tumbleweed/appliances/openSUSE-Tumbleweed-Minimal-VM.x86_64-Cloud.qcow2" - ssh_key = "" + ssh_key = "" # please provide a SSH public key enable_cloudinit = true - # ---- UEFI SETTINGS ---------------------------------------------- - # uefi_firmware = "/usr/share/edk2/ovmf/OVMF_CODE.fd" # Location on Fedora - # uefi_nvram_template = "/usr/share/edk2/ovmf/OVMF_VARS.fd" # Location on Fedora - uefi_firmware = "/usr/share/edk2/x64/OVMF_CODE.4m.fd" # Location on Arch Linux - uefi_nvram_template = "/usr/share/edk2/x64/OVMF_VARS.4m.fd" # Location on Arch Linux - uefi_nvram_file_suffix = "-uefi" - # ---------------------------------------------------------------- } \ No newline at end of file diff --git a/environments/phyllome-42-uefi/main.tf b/environments/phyllome-42-uefi/main.tf index 1b2b8d7..6010075 100644 --- a/environments/phyllome-42-uefi/main.tf +++ b/environments/phyllome-42-uefi/main.tf @@ -17,11 +17,5 @@ module "shared_modules" { vm_name = "phyllome-42-uefi" image_location = "/var/lib/libvirt/images/virtual-desktop-hypervisor.img" - enable_cloudinit = false - # ---- OPTIONAL UEFI SETTINGS ---------------------------------------------- - uefi_firmware = "/usr/share/edk2/x64/OVMF_CODE.4m.fd" - uefi_nvram_template = "/usr/share/edk2/x64/OVMF_VARS.4m.fd" - uefi_nvram_file_suffix = "-uefi" - # ---------------------------------------------------------------- - + uefi_firmware = true } diff --git a/environments/rocky-linux-cloud-10-bios/main.tf b/environments/rocky-linux-cloud-10-bios/main.tf index 2155b48..929c2f8 100644 --- a/environments/rocky-linux-cloud-10-bios/main.tf +++ b/environments/rocky-linux-cloud-10-bios/main.tf @@ -17,6 +17,6 @@ module "shared_modules" { vm_name = "rl-bios" image_location = "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2" - ssh_key = "" + ssh_key = "" # please provide a SSH public key enable_cloudinit = true } \ No newline at end of file diff --git a/environments/ubuntu-cloud-server-2404-bios/main.tf b/environments/ubuntu-cloud-server-2404-bios/main.tf index 605732f..76cbd31 100644 --- a/environments/ubuntu-cloud-server-2404-bios/main.tf +++ b/environments/ubuntu-cloud-server-2404-bios/main.tf @@ -17,6 +17,6 @@ module "shared_modules" { vm_name = "u24-bios" image_location = "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img" - ssh_key = "" + ssh_key = "" # please provide a SSH public key enable_cloudinit = true } \ No newline at end of file diff --git a/environments/ubuntu-cloud-server-2404-uefi/main.tf b/environments/ubuntu-cloud-server-2404-uefi/main.tf index 489cfbb..e356a76 100644 --- a/environments/ubuntu-cloud-server-2404-uefi/main.tf +++ b/environments/ubuntu-cloud-server-2404-uefi/main.tf @@ -17,14 +17,7 @@ module "shared_modules" { vm_name = "u24-uefi" image_location = "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img" - ssh_key = "" + ssh_key = "" # please provide a SSH public key enable_cloudinit = true - # ---- UEFI SETTINGS ---------------------------------------------- - uefi_firmware = "/usr/share/edk2/ovmf/OVMF_CODE.fd" # Location on Fedora - uefi_nvram_template = "/usr/share/edk2/ovmf/OVMF_VARS.fd" # Location on Fedora - # uefi_firmware = "/usr/share/edk2/x64/OVMF_CODE.4m.fd" # Location on Arch Linux - # uefi_nvram_template = "/usr/share/edk2/x64/OVMF_VARS.4m.fd" # Location on Arch Linux - uefi_nvram_file_suffix = "-uefi" - # ---------------------------------------------------------------- - + uefi_firmware = true } \ No newline at end of file