From b77e4fb4c373923c7eff3cb451483a29a6ebf0d3 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Sun, 29 Oct 2023 17:55:04 +0100
Subject: [PATCH] update terraform for jefke

---
 terraform/main.tf | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/terraform/main.tf b/terraform/main.tf
index 48c066b..939146c 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -81,52 +81,41 @@ resource "libvirt_network" "dmzbr" {
   autostart = true
 }
 
-resource "libvirt_pool" "iso_jefke" {
-  name = "iso"
+resource "libvirt_pool" "images_jefke" {
+  name = "images"
   type = "dir"
-  path = "/kvm/iso"
+  path = "/kvm/images"
   provider = libvirt.jefke
 }
 
-resource "libvirt_pool" "disk_jefke" {
-  name = "disk"
+resource "libvirt_pool" "disks_jefke" {
+  name = "disks"
   type = "dir"
-  path = "/kvm/disk"
+  path = "/kvm/disks"
   provider = libvirt.jefke
 }
 
-resource "libvirt_pool" "init_jefke" {
-  name = "init"
+resource "libvirt_pool" "cloudinit_jefke" {
+  name = "cloudinit"
   type = "dir"
-  path = "/kvm/init"
-  provider = libvirt.jefke
-}
-
-resource "libvirt_volume" "ubuntu_jammy_jefke" {
-  name   = "ubuntu-jammy.img"
-  pool   = "iso"
-  source = "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
-  provider = libvirt.jefke
-}
-
-resource "libvirt_volume" "debian_bullseye_jefke" {
-  name = "debian-bullseye.iso"
-  pool = "iso"
-  source = "https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2"
+  path = "/kvm/cloudinit"
   provider = libvirt.jefke
 }
 
 resource "libvirt_volume" "debian_bookworm_jefke" {
   name = "debian-bookworm.qcow2"
-  pool = "iso"
+  pool = "images"
   source = "https://cloud.debian.org/images/cloud/bookworm/daily/latest/debian-12-generic-amd64-daily.qcow2"
   provider = libvirt.jefke
+  depends_on = [
+    libvirt_pool.images_jefke
+  ]
 }
 
-resource "libvirt_network" "dmzbr_jefke" {
-  name = "dmzbr"
+resource "libvirt_network" "bridgedmz_jefke" {
+  name = "bridgedmz"
   mode = "bridge"
-  bridge = "dmzbr"
+  bridge = "bridgedmz"
   dhcp {
     enabled = false
   }