steps/bootstrap: Merge into the infra step

Booting clusters is faster and teardown is more robust if we can
perform everything in a single Terraform step.  With this commit, we
are down to that single step.

It would be nice to drop the terraform_remote_state hack for the
bootstrap Ignition.  But we'll be doing that when we switch to
cmd/openshift-install and its all-Go asset generation, so I'm rolling
with the existing approach for now.

installer/pkg/workflow/destroy.go

@@ -31,7 +31,6 @@ func DestroyWorkflow(clusterDir string, contOnErr bool) Workflow {
 		steps: []step{
 			readClusterConfigStep,
 			generateTerraformVariablesStep,
-			destroyBootstrapStep,
 			destroyWorkersStep,
 			destroyInfraStep,
 			destroyAssetsStep,
@@ -47,10 +46,6 @@ func destroyInfraStep(m *metadata) error {
 	return runDestroyStep(m, infraStep)
 }
 
-func destroyBootstrapStep(m *metadata) error {
-	return runDestroyStep(m, bootstrapStep)
-}
-
 func destroyWorkersStep(m *metadata) error {
 	kubeconfig := filepath.Join(m.clusterDir, generatedPath, "auth", "kubeconfig")
 

installer/pkg/workflow/install.go

@@ -21,7 +21,6 @@ func InstallWorkflow(clusterDir string) Workflow {
 			generateIgnConfigStep,
 			installAssetsStep,
 			installInfraStep,
-			installBootstrapStep,
 		},
 	}
 }
@@ -34,13 +33,6 @@ func installInfraStep(m *metadata) error {
 	return runInstallStep(m, infraStep)
 }
 
-func installBootstrapStep(m *metadata) error {
-	if !hasStateFile(m.clusterDir, bootstrapStep) {
-		return runInstallStep(m, bootstrapStep)
-	}
-	return nil
-}
-
 func runInstallStep(m *metadata, step string, extraArgs ...string) error {
 	templateDir, err := findStepTemplates(step, m.cluster.Platform)
 	if err != nil {

steps/infra/aws/inputs.tf

@@ -0,0 +1,11 @@
+data "terraform_remote_state" "assets" {
+  backend = "local"
+
+  config {
+    path = "${path.cwd}/assets.tfstate"
+  }
+}
+
+locals {
+  ignition_bootstrap = "${data.terraform_remote_state.assets.ignition_bootstrap}"
+}

steps/infra/aws/main.tf

@@ -15,6 +15,25 @@ provider "aws" {
   }
 }
 
+module "bootstrap" {
+  source = "../../../modules/aws/bootstrap"
+
+  ami                         = "${var.tectonic_aws_ec2_ami_override}"
+  associate_public_ip_address = "${var.tectonic_aws_endpoints != "private"}"
+  bucket                      = "${aws_s3_bucket.tectonic.bucket}"
+  cluster_name                = "${var.tectonic_cluster_name}"
+  elbs                        = "${module.vpc.aws_lbs}"
+  iam_role                    = "${var.tectonic_aws_master_iam_role_name}"
+  ignition                    = "${local.ignition_bootstrap}"
+  subnet_id                   = "${module.vpc.master_subnet_ids[0]}"
+  vpc_security_group_ids      = ["${concat(var.tectonic_aws_master_extra_sg_ids, list(module.vpc.master_sg_id))}"]
+
+  tags = "${merge(map(
+      "Name", "${var.tectonic_cluster_name}-bootstrap",
+      "tectonicClusterID", "${var.tectonic_cluster_id}"
+    ), var.tectonic_aws_extra_tags)}"
+}
+
 module "masters" {
   source = "../../../modules/aws/master"
 

steps/infra/libvirt/inputs.tf

@@ -0,0 +1,11 @@
+data "terraform_remote_state" "assets" {
+  backend = "local"
+
+  config {
+    path = "${path.cwd}/assets.tfstate"
+  }
+}
+
+locals {
+  ignition_bootstrap = "${data.terraform_remote_state.assets.ignition_bootstrap}"
+}

steps/infra/libvirt/main.tf

@@ -8,6 +8,16 @@ module "libvirt_base_volume" {
   image = "${var.tectonic_os_image}"
 }
 
+module "bootstrap" {
+  source = "../../../modules/libvirt/bootstrap"
+
+  addresses      = ["${var.tectonic_libvirt_bootstrap_ip}"]
+  base_volume_id = "${module.libvirt_base_volume.coreos_base_volume_id}"
+  cluster_name   = "${var.tectonic_cluster_name}"
+  ignition       = "${local.ignition_bootstrap}"
+  network_id     = "${libvirt_network.tectonic_net.id}"
+}
+
 resource "libvirt_volume" "master" {
   count          = "${var.tectonic_master_count}"
   name           = "master${count.index}"