steps/bootstrap: Use the bootstrap ignition in the tfvars if its set.

If the "ignition_bootstrap" is non-empty in the terraform.tfvars, then use it as the content for the bootstrap ignition. This will enable the new installer binary to launch a cluster.
openshift · Sep 21, 2018 · 0e1b294 · 0e1b294
1 parent 154b84a
commit 0e1b294
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/steps/bootstrap/aws/inputs.tf b/steps/bootstrap/aws/inputs.tf
@@ -20,5 +20,5 @@ locals {
   sg_id      = "${data.terraform_remote_state.infra.master_sg_id}"
   s3_bucket  = "${data.terraform_remote_state.infra.s3_bucket}"
 
-  ignition_bootstrap = "${data.terraform_remote_state.assets.ignition_bootstrap}"
+  ignition_bootstrap = "${var.bootstrap_ignition != "" ? var.bootstrap_ignition : data.terraform_remote_state.assets.ignition_bootstrap}"
 }
diff --git a/steps/bootstrap/libvirt/inputs.tf b/steps/bootstrap/libvirt/inputs.tf
@@ -18,5 +18,5 @@ locals {
   libvirt_network_id     = "${data.terraform_remote_state.infra.libvirt_network_id}"
   libvirt_base_volume_id = "${data.terraform_remote_state.infra.libvirt_base_volume_id}"
 
-  ignition_bootstrap = "${data.terraform_remote_state.assets.ignition_bootstrap}"
+  ignition_bootstrap = "${var.bootstrap_ignition != "" ? var.bootstrap_ignition : data.terraform_remote_state.assets.ignition_bootstrap}"
 }