From 88e3def5639d036b3ccf0344b48c4d8b128d0360 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Mon, 8 May 2023 09:18:13 +0200
Subject: [PATCH] try to fix data share remote exec

---
 files/cloud_init.cfg.tftpl | 2 +-
 main.tf                    | 6 +++---
 variables.tf               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/cloud_init.cfg.tftpl b/files/cloud_init.cfg.tftpl
index 304154b..1c00537 100644
--- a/files/cloud_init.cfg.tftpl
+++ b/files/cloud_init.cfg.tftpl
@@ -40,7 +40,7 @@ runcmd:
 - dhclient
 - locale-gen
 
-%{ if data_share != null }
+%{ if data_share != "" }
 mounts:
 - ["data", "${data_share}", "9p", "trans=virtio,rw", "0", "0"]
 %{ endif }
diff --git a/main.tf b/main.tf
index 6cfdd33..7d3cbd7 100644
--- a/main.tf
+++ b/main.tf
@@ -15,7 +15,7 @@ locals {
     host_cert             = trimspace(null_resource.cert.triggers["cert"]),
     private_key           = tls_private_key.debian.private_key_openssh,
     fixed_dns             = var.fixed_dns
-    data_share        = var.data_share
+    data_share            = var.data_share
   })
   cloudinit_network_config = templatefile("${path.module}/files/network_config.cfg.tftpl", {
     fixed_address = var.fixed_address
@@ -90,7 +90,7 @@ resource "null_resource" "data_share" {
 
   provisioner "remote-exec" {
     inline = [
-      "if [ \"${var.data_share}\" != \"null\"; then mkdir -p --mode=og=rwx /data/${local.domain_name}; fi"
+      "if [ \"${var.data_share}\" != \"\"; then mkdir -p --mode=og=rwx /data/${local.domain_name}; fi"
     ]
   }
 }
@@ -106,7 +106,7 @@ resource "libvirt_domain" "debian" {
   }
 
   dynamic "filesystem" {
-    for_each = var.data_share != null ? [1] : []
+    for_each = var.data_share != "" ? [1] : []
 
     content {
       source   = "/data/${local.domain_name}"
diff --git a/variables.tf b/variables.tf
index dbdc56c..6f29c50 100644
--- a/variables.tf
+++ b/variables.tf
@@ -103,8 +103,8 @@ variable "fixed_dns" {
 
 variable "data_share" {
   type        = string
-  default     = null
-  description = "Location for the data share on the guest OS."
+  default     = ""
+  description = "Location for the data share on the guest OS. Leave empty to disable."
 }
 
 variable "hypervisor_host" {