Skip to content

Commit

Permalink
steps/infra: Use the bootstrap ignition in the tfvars if its set.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Yifan Gu committed Sep 21, 2018
1 parent 186622f commit f759287
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,15 @@ variable "ignition_worker" {
EOF
}

variable "ignition_bootstrap" {
type = "string"
default = ""

description = <<EOF
(internal) Ignition config file contents. This is automatically generated by the installer.
EOF
}

variable "tectonic_platform" {
type = "string"

Expand Down
2 changes: 1 addition & 1 deletion steps/infra/aws/inputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ data "terraform_remote_state" "assets" {
}

locals {
ignition_bootstrap = "${data.terraform_remote_state.assets.ignition_bootstrap}"
ignition_bootstrap = "${var.ignition_bootstrap != "" ? var.ignition_bootstrap : data.terraform_remote_state.assets.ignition_bootstrap}"
}
2 changes: 1 addition & 1 deletion steps/infra/libvirt/inputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ data "terraform_remote_state" "assets" {
}

locals {
ignition_bootstrap = "${data.terraform_remote_state.assets.ignition_bootstrap}"
ignition_bootstrap = "${var.ignition_bootstrap != "" ? var.ignition_bootstrap : data.terraform_remote_state.assets.ignition_bootstrap}"
}

0 comments on commit f759287

Please sign in to comment.