Merge pull request #6860 from jcpowermac/OCPBUGS-7551

[release-4.12] OCPBUGS-7551: vSphere - ignore all bootstrap disk changes
openshift · May 25, 2023 · 473de09 · 473de09
2 parents c491755 + 03e8979
commit 473de09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/data/data/vsphere/bootstrap/main.tf b/data/data/vsphere/bootstrap/main.tf
@@ -33,13 +33,13 @@ resource "vsphere_virtual_machine" "vm_bootstrap" {
     eagerly_scrub    = var.scrub_disk
     thin_provisioned = var.thin_disk
   }
+
   lifecycle {
     ignore_changes = [
-      disk[0].eagerly_scrub,
+      disk[0],
     ]
   }
 
-
   clone {
     template_uuid = var.template
   }

diff --git a/data/data/vspherezoning/bootstrap/main.tf b/data/data/vspherezoning/bootstrap/main.tf
@@ -37,6 +37,12 @@ resource "vsphere_virtual_machine" "vm_bootstrap" {
     thin_provisioned = var.template[0].disks.0.thin_provisioned
   }
 
+  lifecycle {
+    ignore_changes = [
+      disk[0],
+    ]
+  }
+
   clone {
     template_uuid = var.template[0].uuid
   }