From 2d13de3071450aa239136f04b5d7e531f2551d06 Mon Sep 17 00:00:00 2001
From: Nicolas MASSE <nicolas.masse@itix.fr>
Date: Wed, 17 Mar 2021 10:32:32 +0100
Subject: [PATCH] fix on_destroy provisioner

---
 post-install.tf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/post-install.tf b/post-install.tf
index b594317..14f7eac 100644
--- a/post-install.tf
+++ b/post-install.tf
@@ -19,25 +19,29 @@ resource "local_file" "dns_config" {
 resource "null_resource" "dnsmasq_config" {
   triggers = {
     network_id = libvirt_network.ocp_net.id
+    libvirt_server = local.libvirt_server
+    libvirt_username = local.libvirt_username
+    network_domain = local.network_domain
   }
 
   connection {
     type = "ssh"
-    host = local.libvirt_server
-    user = local.libvirt_username
+    host = self.triggers.libvirt_server
+    user = self.triggers.libvirt_username
   }
 
   provisioner "remote-exec" {
     inline = [
-      "echo 'server=/${local.network_domain}/${cidrhost(var.network_ip_range, 1)}' | sudo tee /etc/NetworkManager/dnsmasq.d/libvirt-ocp-${var.cluster_name}.conf",
+      "echo 'server=/${local.network_domain}/${cidrhost(var.network_ip_range, 1)}' | sudo tee /etc/NetworkManager/dnsmasq.d/zone-${local.network_domain}.conf",
       "sudo pkill -f '[d]nsmasq.*--enable-dbus=org.freedesktop.NetworkManager.dnsmasq'"
     ]
   }
 
   provisioner "remote-exec" {
     when = destroy
+    on_failure = continue
     inline = [
-      "sudo rm -f /etc/NetworkManager/dnsmasq.d/libvirt-ocp-${var.cluster_name}.conf",
+      "sudo rm -f /etc/NetworkManager/dnsmasq.d/zone-${self.triggers.network_domain}.conf",
       "sudo pkill -f '[d]nsmasq.*--enable-dbus=org.freedesktop.NetworkManager.dnsmasq'"
     ]
   }