From 91e23f07658353a3311ae6a1b31de3946e8792df Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Sat, 18 Oct 2025 13:18:32 +0200 Subject: [PATCH] move up files to one level and erase default public key --- .../fedora-cloud-server-42-bios/main.tf | 22 +++++++++++++++ .../phyllome-42-uefi/main.tf | 0 .../ubuntu-cloud-server-2404-bios/main.tf | 22 +++++++++++++++ .../ubuntu-cloud-server-2404-uefi/main.tf | 28 +++++++++++++++++++ .../fedora-cloud-server-42-bios/main.tf | 22 --------------- .../ubuntu-cloud-server-2404-bios/main.tf | 22 --------------- .../ubuntu-cloud-server-2404-uefi/main.tf | 28 ------------------- .../cloud-init.tf | 0 .../cloud_init.yaml | 0 .../domain.tf | 0 .../network.tf | 0 .../shared_modules => shared_modules}/pool.tf | 0 .../provider.tf | 0 .../q35-workaround.xslt | 0 .../variables.tf | 0 .../volume.tf | 0 16 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 environments/fedora-cloud-server-42-bios/main.tf rename {multiple/environments => environments}/phyllome-42-uefi/main.tf (100%) create mode 100644 environments/ubuntu-cloud-server-2404-bios/main.tf create mode 100644 environments/ubuntu-cloud-server-2404-uefi/main.tf delete mode 100644 multiple/environments/fedora-cloud-server-42-bios/main.tf delete mode 100644 multiple/environments/ubuntu-cloud-server-2404-bios/main.tf delete mode 100644 multiple/environments/ubuntu-cloud-server-2404-uefi/main.tf rename {multiple/shared_modules => shared_modules}/cloud-init.tf (100%) rename {multiple/shared_modules => shared_modules}/cloud_init.yaml (100%) rename {multiple/shared_modules => shared_modules}/domain.tf (100%) rename {multiple/shared_modules => shared_modules}/network.tf (100%) rename {multiple/shared_modules => shared_modules}/pool.tf (100%) rename {multiple/shared_modules => shared_modules}/provider.tf (100%) rename {multiple/shared_modules => shared_modules}/q35-workaround.xslt (100%) rename {multiple/shared_modules => shared_modules}/variables.tf (100%) rename {multiple/shared_modules => shared_modules}/volume.tf (100%) diff --git a/environments/fedora-cloud-server-42-bios/main.tf b/environments/fedora-cloud-server-42-bios/main.tf new file mode 100644 index 0000000..61979c3 --- /dev/null +++ b/environments/fedora-cloud-server-42-bios/main.tf @@ -0,0 +1,22 @@ +terraform { + required_version = ">= 0.13" + required_providers { + libvirt = { + source = "dmacvicar/libvirt" + version = "0.8.3" + } + } +} + +provider "libvirt" { + uri = "qemu:///system" +} + +module "shared_modules" { + source = "../../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 = "" + enable_cloudinit = true +} \ No newline at end of file diff --git a/multiple/environments/phyllome-42-uefi/main.tf b/environments/phyllome-42-uefi/main.tf similarity index 100% rename from multiple/environments/phyllome-42-uefi/main.tf rename to environments/phyllome-42-uefi/main.tf diff --git a/environments/ubuntu-cloud-server-2404-bios/main.tf b/environments/ubuntu-cloud-server-2404-bios/main.tf new file mode 100644 index 0000000..78224e4 --- /dev/null +++ b/environments/ubuntu-cloud-server-2404-bios/main.tf @@ -0,0 +1,22 @@ +terraform { + required_version = ">= 0.13" + required_providers { + libvirt = { + source = "dmacvicar/libvirt" + version = "0.8.3" + } + } +} + +provider "libvirt" { + uri = "qemu:///system" +} + +module "shared_modules" { + source = "../../shared_modules" + + vm_name = "u24-bios" + image_location = "/var/lib/libvirt/images/noble-server-cloudimg-amd64.img" + ssh_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 new file mode 100644 index 0000000..69ed136 --- /dev/null +++ b/environments/ubuntu-cloud-server-2404-uefi/main.tf @@ -0,0 +1,28 @@ +terraform { + required_version = ">= 0.13" + required_providers { + libvirt = { + source = "dmacvicar/libvirt" + version = "0.8.3" + } + } +} + +provider "libvirt" { + uri = "qemu:///system" +} + +module "shared_modules" { + source = "../../shared_modules" + + vm_name = "u24-uefi" + image_location = "/var/lib/libvirt/images/noble-server-cloudimg-amd64.img" + ssh_key = "" + enable_cloudinit = true + # ---- 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" + # ---------------------------------------------------------------- + +} \ No newline at end of file diff --git a/multiple/environments/fedora-cloud-server-42-bios/main.tf b/multiple/environments/fedora-cloud-server-42-bios/main.tf deleted file mode 100644 index 9a8908b..0000000 --- a/multiple/environments/fedora-cloud-server-42-bios/main.tf +++ /dev/null @@ -1,22 +0,0 @@ -terraform { - required_version = ">= 0.13" - required_providers { - libvirt = { - source = "dmacvicar/libvirt" - version = "0.8.3" - } - } -} - -provider "libvirt" { - uri = "qemu:///system" -} - -module "shared_modules" { - source = "../../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-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMSuVlvOsMqx9qOrKKB1295FjCf2QhHfR1qola9brGkUcFL9dAztG2qdQnpiuPQ4OJpkedrO3C/ixEw1MLTL8l12SvYy/Q9QFguwylp35Nbw1p8h7jrX1FcNLRYltxkMgVhCs1InT5m0lf56bu1h7JfsMs7Ovsy3lU5OdK4h2MysTSKOLctsE4jDJ+XbJYQzj4rbfB/U7/9ple366cGl6xlaHxVfI4BUFWUOiVU4HWvZjrOM5fqPt+AUFRx1l2D7hLUZgOdVQwgO8GFn0sCyCIw0NCXbDn/H05pvWtTUPnyhj5TiseF8qW1byrrT5G8saxwvx8nbIK2tpPfKFdIiL7aj9bYQdltn1knJtvk3hpTPy4QvAbaoGfnfrPAsyU1A/CTw9SD/idvDT2wt1hVsm8EsnpovF7WT5z22fcgoFLDo+QCQrp7t1Wx0/Djay2nThi3FO3N051y5fQWoKOvTsm+rRhrzpDoc+Wtrtss3ua54qnQxHRx3YC0M5Xl9DINkwrcunbZBhozsDG2DzX9qcyzJsSfm9Zt5yM2lpcq+dGPRO1wedw4ogoOpobRr9Cja9W/lJvxmjgIiHz2HbSFPtk/VGjL6M7aQor/GDNN3ugSsfUoTTmNaS9+lWeg+tQWcFUPhYQtQB4/gHQ2u7+mQ0H3hVybsIKIh5XBpAdHQ7pww==" - enable_cloudinit = true -} \ No newline at end of file diff --git a/multiple/environments/ubuntu-cloud-server-2404-bios/main.tf b/multiple/environments/ubuntu-cloud-server-2404-bios/main.tf deleted file mode 100644 index 5a9a946..0000000 --- a/multiple/environments/ubuntu-cloud-server-2404-bios/main.tf +++ /dev/null @@ -1,22 +0,0 @@ -terraform { - required_version = ">= 0.13" - required_providers { - libvirt = { - source = "dmacvicar/libvirt" - version = "0.8.3" - } - } -} - -provider "libvirt" { - uri = "qemu:///system" -} - -module "shared_modules" { - source = "../../shared_modules" - - vm_name = "u24-bios" - image_location = "/var/lib/libvirt/images/noble-server-cloudimg-amd64.img" - ssh_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMSuVlvOsMqx9qOrKKB1295FjCf2QhHfR1qola9brGkUcFL9dAztG2qdQnpiuPQ4OJpkedrO3C/ixEw1MLTL8l12SvYy/Q9QFguwylp35Nbw1p8h7jrX1FcNLRYltxkMgVhCs1InT5m0lf56bu1h7JfsMs7Ovsy3lU5OdK4h2MysTSKOLctsE4jDJ+XbJYQzj4rbfB/U7/9ple366cGl6xlaHxVfI4BUFWUOiVU4HWvZjrOM5fqPt+AUFRx1l2D7hLUZgOdVQwgO8GFn0sCyCIw0NCXbDn/H05pvWtTUPnyhj5TiseF8qW1byrrT5G8saxwvx8nbIK2tpPfKFdIiL7aj9bYQdltn1knJtvk3hpTPy4QvAbaoGfnfrPAsyU1A/CTw9SD/idvDT2wt1hVsm8EsnpovF7WT5z22fcgoFLDo+QCQrp7t1Wx0/Djay2nThi3FO3N051y5fQWoKOvTsm+rRhrzpDoc+Wtrtss3ua54qnQxHRx3YC0M5Xl9DINkwrcunbZBhozsDG2DzX9qcyzJsSfm9Zt5yM2lpcq+dGPRO1wedw4ogoOpobRr9Cja9W/lJvxmjgIiHz2HbSFPtk/VGjL6M7aQor/GDNN3ugSsfUoTTmNaS9+lWeg+tQWcFUPhYQtQB4/gHQ2u7+mQ0H3hVybsIKIh5XBpAdHQ7pww==" - enable_cloudinit = true -} \ No newline at end of file diff --git a/multiple/environments/ubuntu-cloud-server-2404-uefi/main.tf b/multiple/environments/ubuntu-cloud-server-2404-uefi/main.tf deleted file mode 100644 index b09558c..0000000 --- a/multiple/environments/ubuntu-cloud-server-2404-uefi/main.tf +++ /dev/null @@ -1,28 +0,0 @@ -terraform { - required_version = ">= 0.13" - required_providers { - libvirt = { - source = "dmacvicar/libvirt" - version = "0.8.3" - } - } -} - -provider "libvirt" { - uri = "qemu:///system" -} - -module "shared_modules" { - source = "../../shared_modules" - - vm_name = "u24-uefi" - image_location = "/var/lib/libvirt/images/noble-server-cloudimg-amd64.img" - ssh_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMSuVlvOsMqx9qOrKKB1295FjCf2QhHfR1qola9brGkUcFL9dAztG2qdQnpiuPQ4OJpkedrO3C/ixEw1MLTL8l12SvYy/Q9QFguwylp35Nbw1p8h7jrX1FcNLRYltxkMgVhCs1InT5m0lf56bu1h7JfsMs7Ovsy3lU5OdK4h2MysTSKOLctsE4jDJ+XbJYQzj4rbfB/U7/9ple366cGl6xlaHxVfI4BUFWUOiVU4HWvZjrOM5fqPt+AUFRx1l2D7hLUZgOdVQwgO8GFn0sCyCIw0NCXbDn/H05pvWtTUPnyhj5TiseF8qW1byrrT5G8saxwvx8nbIK2tpPfKFdIiL7aj9bYQdltn1knJtvk3hpTPy4QvAbaoGfnfrPAsyU1A/CTw9SD/idvDT2wt1hVsm8EsnpovF7WT5z22fcgoFLDo+QCQrp7t1Wx0/Djay2nThi3FO3N051y5fQWoKOvTsm+rRhrzpDoc+Wtrtss3ua54qnQxHRx3YC0M5Xl9DINkwrcunbZBhozsDG2DzX9qcyzJsSfm9Zt5yM2lpcq+dGPRO1wedw4ogoOpobRr9Cja9W/lJvxmjgIiHz2HbSFPtk/VGjL6M7aQor/GDNN3ugSsfUoTTmNaS9+lWeg+tQWcFUPhYQtQB4/gHQ2u7+mQ0H3hVybsIKIh5XBpAdHQ7pww==" - enable_cloudinit = true - # ---- 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" - # ---------------------------------------------------------------- - -} \ No newline at end of file diff --git a/multiple/shared_modules/cloud-init.tf b/shared_modules/cloud-init.tf similarity index 100% rename from multiple/shared_modules/cloud-init.tf rename to shared_modules/cloud-init.tf diff --git a/multiple/shared_modules/cloud_init.yaml b/shared_modules/cloud_init.yaml similarity index 100% rename from multiple/shared_modules/cloud_init.yaml rename to shared_modules/cloud_init.yaml diff --git a/multiple/shared_modules/domain.tf b/shared_modules/domain.tf similarity index 100% rename from multiple/shared_modules/domain.tf rename to shared_modules/domain.tf diff --git a/multiple/shared_modules/network.tf b/shared_modules/network.tf similarity index 100% rename from multiple/shared_modules/network.tf rename to shared_modules/network.tf diff --git a/multiple/shared_modules/pool.tf b/shared_modules/pool.tf similarity index 100% rename from multiple/shared_modules/pool.tf rename to shared_modules/pool.tf diff --git a/multiple/shared_modules/provider.tf b/shared_modules/provider.tf similarity index 100% rename from multiple/shared_modules/provider.tf rename to shared_modules/provider.tf diff --git a/multiple/shared_modules/q35-workaround.xslt b/shared_modules/q35-workaround.xslt similarity index 100% rename from multiple/shared_modules/q35-workaround.xslt rename to shared_modules/q35-workaround.xslt diff --git a/multiple/shared_modules/variables.tf b/shared_modules/variables.tf similarity index 100% rename from multiple/shared_modules/variables.tf rename to shared_modules/variables.tf diff --git a/multiple/shared_modules/volume.tf b/shared_modules/volume.tf similarity index 100% rename from multiple/shared_modules/volume.tf rename to shared_modules/volume.tf