Merge pull request #8342 from barbacbd/gcp_signed_url_and_shim

openshift-merge-bot[bot] · web-flow · commit a17a7b401b0a · 2024-05-16T04:52:23.000Z
OCPBUGS-33709: GCP mixup when using the ignition shim vs the signed url
diff --git a/data/data/gcp/bootstrap/main.tf b/data/data/gcp/bootstrap/main.tf
@@ -118,7 +118,7 @@ resource "google_compute_instance" "bootstrap" {
   }
 
   metadata = {
-    user-data = data.ignition_config.redirect.rendered
+    user-data = var.gcp_ignition_shim
   }
 
   tags = ["${var.cluster_id}-master", "${var.cluster_id}-bootstrap"]

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ resource "google_compute_instance" "bootstrap" {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`metadata = {`
`121`		`- user-data = data.ignition_config.redirect.rendered`
	`121`	`+ user-data = var.gcp_ignition_shim`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`tags = ["${var.cluster_id}-master", "${var.cluster_id}-bootstrap"]`