diff --git a/BUILD.bazel b/BUILD.bazel
index a7164142de6..dbeed755793 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -84,14 +84,22 @@ pkg_tar(
     strip_prefix = ".",
     deps = [
         ":cli_bin",
+        ":old_cli_bin",
         ":tf_bin",
     ],
 )
 
 pkg_tar(
-    name = "cli_bin",
+    name = "old_cli_bin",
     srcs = ["//installer/cmd/tectonic"],
-    mode = "0777",
+    mode = "0555",
+    package_dir = "installer",
+)
+
+pkg_tar(
+    name = "cli_bin",
+    srcs = ["//cmd/openshift-install"],
+    mode = "0555",
     package_dir = "installer",
 )
 
diff --git a/cmd/openshift-install/BUILD.bazel b/cmd/openshift-install/BUILD.bazel
index b6362cae12f..4ae24c7cd18 100644
--- a/cmd/openshift-install/BUILD.bazel
+++ b/cmd/openshift-install/BUILD.bazel
@@ -15,6 +15,10 @@ go_library(
 
 go_binary(
     name = "openshift-install",
+    out = "openshift-install",
     embed = [":go_default_library"],
+    # Use pure to build a pure-go binary.
+    # This has the nice side effect of making the binary statically linked.
+    pure = "on",
     visibility = ["//visibility:public"],
 )
diff --git a/cmd/openshift-install/main.go b/cmd/openshift-install/main.go
index b97964c67a6..1d9e1b6be44 100644
--- a/cmd/openshift-install/main.go
+++ b/cmd/openshift-install/main.go
@@ -14,6 +14,7 @@ var (
 	installConfigCommand   = kingpin.Command("install-config", "Generate the Install Config asset")
 	ignitionConfigsCommand = kingpin.Command("ignition-configs", "Generate the Ignition Config assets")
 	manifestsCommand       = kingpin.Command("manifests", "Generate the Kubernetes manifests")
+	clusterCommand         = kingpin.Command("cluster", "Create an OpenShift cluster")
 
 	dirFlag  = kingpin.Flag("dir", "assets directory").Default(".").String()
 	logLevel = kingpin.Flag("log-level", "log level (e.g. \"debug\")").Default("warn").Enum("debug", "info", "warn", "error", "fatal", "panic")
@@ -39,6 +40,12 @@ func main() {
 			assetStock.Manifests(),
 			assetStock.Tectonic(),
 		}
+	case clusterCommand.FullCommand():
+		targetAssets = []asset.Asset{
+			assetStock.TFVars(),
+			assetStock.KubeconfigAdmin(),
+			assetStock.Cluster(),
+		}
 	}
 
 	l, err := log.ParseLevel(*logLevel)
diff --git a/config.tf b/config.tf
index ea06c097009..a70992438f3 100644
--- a/config.tf
+++ b/config.tf
@@ -294,21 +294,30 @@ variable "tectonic_kubelet_debug_config" {
   description = "(internal) debug flags for the kubelet (used in CI only)"
 }
 
-variable "tectonic_ignition_masters" {
+variable "ignition_masters" {
   type    = "list"
   default = []
 
   description = <<EOF
-(internal) Ignition config file paths. This is automatically generated by the installer.
+(internal) Ignition config file contents. This is automatically generated by the installer.
 EOF
 }
 
-variable "tectonic_ignition_worker" {
+variable "ignition_worker" {
   type    = "string"
   default = ""
 
   description = <<EOF
-(internal) Ignition config file path. This is automatically generated by the installer.
+(internal) Ignition config file contents. This is automatically generated by the installer.
+EOF
+}
+
+variable "ignition_bootstrap" {
+  type    = "string"
+  default = ""
+
+  description = <<EOF
+(internal) Ignition config file contents. This is automatically generated by the installer.
 EOF
 }
 
diff --git a/installer/pkg/config-generator/ignition.go b/installer/pkg/config-generator/ignition.go
index d3f03809539..a19a5ef49c9 100644
--- a/installer/pkg/config-generator/ignition.go
+++ b/installer/pkg/config-generator/ignition.go
@@ -18,7 +18,8 @@ const (
 )
 
 // GenerateIgnConfig generates Ignition configs for the workers and masters.
-func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error {
+// It returns the content of the ignition files.
+func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) (masterIgns []string, workerIgn string, err error) {
 	var masters config.NodePool
 	var workers config.NodePool
 	for _, pool := range c.NodePools {
@@ -28,18 +29,18 @@ func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error {
 		case "worker":
 			workers = pool
 		default:
-			return fmt.Errorf("unrecognized role: %s", pool.Name)
+			return nil, "", fmt.Errorf("unrecognized role: %s", pool.Name)
 		}
 	}
 
 	ca, err := ioutil.ReadFile(filepath.Join(clusterDir, caPath))
 	if err != nil {
-		return err
+		return nil, "", err
 	}
 
 	workerCfg, err := parseIgnFile(workers.IgnitionFile)
 	if err != nil {
-		return fmt.Errorf("failed to parse Ignition config for workers: %v", err)
+		return nil, "", fmt.Errorf("failed to parse Ignition config for workers: %v", err)
 	}
 
 	// XXX(crawford): The SSH key should only be added to the bootstrap
@@ -49,13 +50,15 @@ func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error {
 	c.appendCertificateAuthority(&workerCfg, ca)
 	c.embedAppendBlock(&workerCfg, "worker", "")
 
-	if err = ignCfgToFile(workerCfg, filepath.Join(clusterDir, config.IgnitionPathWorker)); err != nil {
-		return err
+	ign, err := json.Marshal(&workerCfg)
+	if err != nil {
+		return nil, "", fmt.Errorf("failed to marshal worker ignition: %v", err)
 	}
+	workerIgn = string(ign)
 
 	masterCfg, err := parseIgnFile(masters.IgnitionFile)
 	if err != nil {
-		return fmt.Errorf("failed to parse Ignition config for masters: %v", err)
+		return nil, "", fmt.Errorf("failed to parse Ignition config for masters: %v", err)
 	}
 
 	for i := 0; i < masters.Count; i++ {
@@ -68,12 +71,14 @@ func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error {
 		c.appendCertificateAuthority(&ignCfg, ca)
 		c.embedAppendBlock(&ignCfg, "master", fmt.Sprintf("etcd_index=%d", i))
 
-		if err = ignCfgToFile(ignCfg, filepath.Join(clusterDir, fmt.Sprintf(config.IgnitionPathMaster, i))); err != nil {
-			return err
+		masterIgn, err := json.Marshal(&ignCfg)
+		if err != nil {
+			return nil, "", fmt.Errorf("failed to marshal master ignition: %v", err)
 		}
+		masterIgns = append(masterIgns, string(masterIgn))
 	}
 
-	return nil
+	return masterIgns, workerIgn, nil
 }
 
 func parseIgnFile(filePath string) (ignconfigtypes.Config, error) {
@@ -139,12 +144,3 @@ func (c *ConfigGenerator) getMCSURL(role string, query string) string {
 	}
 	return u
 }
-
-func ignCfgToFile(ignCfg ignconfigtypes.Config, filePath string) error {
-	data, err := json.MarshalIndent(&ignCfg, "", "  ")
-	if err != nil {
-		return err
-	}
-
-	return ioutil.WriteFile(filePath, data, 0666)
-}
diff --git a/installer/pkg/workflow/BUILD.bazel b/installer/pkg/workflow/BUILD.bazel
index 43b0c4645e5..b3f677adaec 100644
--- a/installer/pkg/workflow/BUILD.bazel
+++ b/installer/pkg/workflow/BUILD.bazel
@@ -5,10 +5,8 @@ go_library(
     srcs = [
         "convert.go",
         "destroy.go",
-        "executor.go",
         "init.go",
         "install.go",
-        "terraform.go",
         "utils.go",
         "workflow.go",
     ],
@@ -16,6 +14,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//installer/pkg/config-generator:go_default_library",
+        "//pkg/terraform:go_default_library",
         "//pkg/types/config:go_default_library",
         "//vendor/github.com/Sirupsen/logrus:go_default_library",
         "//vendor/gopkg.in/yaml.v2:go_default_library",
diff --git a/installer/pkg/workflow/destroy.go b/installer/pkg/workflow/destroy.go
index b7eaa90cc63..5118d65bc4b 100644
--- a/installer/pkg/workflow/destroy.go
+++ b/installer/pkg/workflow/destroy.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/openshift/installer/pkg/terraform"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -39,11 +40,11 @@ func DestroyWorkflow(clusterDir string, contOnErr bool) Workflow {
 }
 
 func destroyAssetsStep(m *metadata) error {
-	return runDestroyStep(m, assetsStep)
+	return runDestroyStep(m, terraform.AssetsStep)
 }
 
 func destroyInfraStep(m *metadata) error {
-	return runDestroyStep(m, infraStep)
+	return runDestroyStep(m, terraform.InfraStep)
 }
 
 func destroyWorkersStep(m *metadata) error {
@@ -127,16 +128,22 @@ func deleteWorkerMachineSet(client *clientset.Clientset) error {
 }
 
 func runDestroyStep(m *metadata, step string, extraArgs ...string) error {
-	if !hasStateFile(m.clusterDir, step) {
+	if !terraform.HasStateFile(m.clusterDir, step) {
 		// there is no statefile, therefore nothing to destroy for this step
 		return nil
 	}
-	templateDir, err := findStepTemplates(step, m.cluster.Platform)
+
+	dir, err := terraform.BaseLocation()
+	if err != nil {
+		return err
+	}
+
+	templateDir, err := terraform.FindStepTemplates(dir, step, m.cluster.Platform)
 	if err != nil {
 		return err
 	}
 
-	return tfDestroy(m.clusterDir, step, templateDir, extraArgs...)
+	return terraform.Destroy(m.clusterDir, step, templateDir, extraArgs...)
 }
 
 func buildClusterClient(kubeconfig string) (*clientset.Clientset, error) {
diff --git a/installer/pkg/workflow/fixtures/terraform.tfvars b/installer/pkg/workflow/fixtures/terraform.tfvars
index f60c5d7b37a..c427ff5be44 100644
--- a/installer/pkg/workflow/fixtures/terraform.tfvars
+++ b/installer/pkg/workflow/fixtures/terraform.tfvars
@@ -15,11 +15,6 @@
   "tectonic_aws_worker_root_volume_size": 30,
   "tectonic_aws_worker_root_volume_type": "gp2",
   "tectonic_base_domain": "tectonic-ci.de",
-  "tectonic_ignition_masters": [
-    "master-0.ign",
-    "master-1.ign"
-  ],
-  "tectonic_ignition_worker": "worker.ign",
   "tectonic_libvirt_network_if": "osbr0",
   "tectonic_master_count": 2,
   "tectonic_cluster_name": "aws-basic",
diff --git a/installer/pkg/workflow/init.go b/installer/pkg/workflow/init.go
index 9e0c7daee2f..c778f6a0c1f 100644
--- a/installer/pkg/workflow/init.go
+++ b/installer/pkg/workflow/init.go
@@ -32,8 +32,6 @@ func InitWorkflow(configFilePath string) Workflow {
 		metadata: metadata{configFilePath: configFilePath},
 		steps: []step{
 			prepareWorspaceStep,
-			readClusterConfigStep,
-			generateTerraformVariablesStep,
 		},
 	}
 }
diff --git a/installer/pkg/workflow/install.go b/installer/pkg/workflow/install.go
index 22c7dcaf49f..27f71bda063 100644
--- a/installer/pkg/workflow/install.go
+++ b/installer/pkg/workflow/install.go
@@ -1,11 +1,15 @@
 package workflow
 
 import (
+	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 
 	"github.com/openshift/installer/installer/pkg/config-generator"
+	"github.com/openshift/installer/pkg/terraform"
+	"github.com/openshift/installer/pkg/types/config"
 )
 
 // InstallWorkflow creates new instances of the 'install' workflow,
@@ -26,27 +30,56 @@ func InstallWorkflow(clusterDir string) Workflow {
 }
 
 func installAssetsStep(m *metadata) error {
-	return runInstallStep(m, assetsStep)
+	return runInstallStep(m, terraform.AssetsStep)
 }
 
 func installInfraStep(m *metadata) error {
-	return runInstallStep(m, infraStep)
+	return runInstallStep(m, terraform.InfraStep)
 }
 
 func runInstallStep(m *metadata, step string, extraArgs ...string) error {
-	templateDir, err := findStepTemplates(step, m.cluster.Platform)
+	dir, err := terraform.BaseLocation()
 	if err != nil {
 		return err
 	}
-	if err := tfInit(m.clusterDir, templateDir); err != nil {
+	templateDir, err := terraform.FindStepTemplates(dir, step, m.cluster.Platform)
+	if err != nil {
+		return err
+	}
+	if err := terraform.Init(m.clusterDir, templateDir); err != nil {
 		return err
 	}
-	return tfApply(m.clusterDir, step, templateDir, extraArgs...)
+	_, err = terraform.Apply(m.clusterDir, step, templateDir, extraArgs...)
+	return err
 }
 
 func generateIgnConfigStep(m *metadata) error {
 	c := configgenerator.New(m.cluster)
-	return c.GenerateIgnConfig(m.clusterDir)
+	masterIgns, workerIgn, err := c.GenerateIgnConfig(m.clusterDir)
+	if err != nil {
+		return fmt.Errorf("failed to generate ignition configs: %v", err)
+	}
+
+	terraformVariablesFilePath := filepath.Join(m.clusterDir, terraformVariablesFileName)
+	data, err := ioutil.ReadFile(terraformVariablesFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to read terraform.tfvars: %v", err)
+	}
+
+	var cluster config.Cluster
+	if err := json.Unmarshal(data, &cluster); err != nil {
+		return fmt.Errorf("failed to unmarshal terraform.tfvars: %v", err)
+	}
+
+	cluster.IgnitionMasters = masterIgns
+	cluster.IgnitionWorker = workerIgn
+
+	data, err = json.MarshalIndent(&cluster, "", "  ")
+	if err != nil {
+		return fmt.Errorf("failed to marshal terraform.tfvars: %v", err)
+	}
+
+	return ioutil.WriteFile(terraformVariablesFilePath, data, 0666)
 }
 
 func generateTLSConfigStep(m *metadata) error {
diff --git a/installer/pkg/workflow/terraform.go b/installer/pkg/workflow/terraform.go
deleted file mode 100644
index 3fdae4401bf..00000000000
--- a/installer/pkg/workflow/terraform.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package workflow
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-)
-
-func terraformExec(clusterDir string, args ...string) error {
-	// Create an executor
-	ex, err := newExecutor()
-	if err != nil {
-		return fmt.Errorf("could not create Terraform executor: %s", err)
-	}
-
-	err = ex.execute(clusterDir, args...)
-	if err != nil {
-		return fmt.Errorf("failed to run Terraform: %s", err)
-	}
-	return nil
-}
-
-func tfApply(clusterDir string, state string, templateDir string, extraArgs ...string) error {
-	defaultArgs := []string{
-		"apply",
-		"-auto-approve",
-		fmt.Sprintf("-state=%s.tfstate", state),
-	}
-	extraArgs = append(extraArgs, templateDir)
-	args := append(defaultArgs, extraArgs...)
-	return terraformExec(clusterDir, args...)
-}
-
-func tfDestroy(clusterDir, state, templateDir string, extraArgs ...string) error {
-	defaultArgs := []string{
-		"destroy",
-		"-force",
-		fmt.Sprintf("-state=%s.tfstate", state),
-	}
-	extraArgs = append(extraArgs, templateDir)
-	args := append(defaultArgs, extraArgs...)
-	return terraformExec(clusterDir, args...)
-}
-
-func tfInit(clusterDir, templateDir string) error {
-	return terraformExec(clusterDir, "init", templateDir)
-}
-
-func hasStateFile(stateDir string, stateName string) bool {
-	stepStateFile := filepath.Join(stateDir, fmt.Sprintf("%s.tfstate", stateName))
-	_, err := os.Stat(stepStateFile)
-	return !os.IsNotExist(err)
-}
diff --git a/installer/pkg/workflow/utils.go b/installer/pkg/workflow/utils.go
index e0f6ff3b0fe..b0345bf656e 100644
--- a/installer/pkg/workflow/utils.go
+++ b/installer/pkg/workflow/utils.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path"
 	"path/filepath"
 
 	configgenerator "github.com/openshift/installer/installer/pkg/config-generator"
@@ -13,43 +12,10 @@ import (
 )
 
 const (
-	assetsStep       = "assets"
-	bootstrapStep    = "bootstrap"
-	binaryPrefix     = "installer"
 	configFileName   = "config.yaml"
-	infraStep        = "infra"
 	internalFileName = "internal.yaml"
-	stepsBaseDir     = "steps"
 )
 
-// returns the directory containing templates for a given step. If platform is
-// specified, it looks for a subdirectory with platform first, falling back if
-// there are no platform-specific templates for that step
-func findStepTemplates(stepName string, platform config.Platform) (string, error) {
-	base, err := baseLocation()
-	if err != nil {
-		return "", fmt.Errorf("error looking up step %s templates: %v", stepName, err)
-	}
-	stepDir := filepath.Join(base, stepsBaseDir, stepName)
-	for _, path := range []string{
-		filepath.Join(stepDir, string(platform)),
-		stepDir} {
-
-		stat, err := os.Stat(path)
-		if err != nil {
-			if os.IsNotExist(err) {
-				continue
-			}
-			return "", fmt.Errorf("invalid path for %q templates: %s", base, err)
-		}
-		if !stat.IsDir() {
-			return "", fmt.Errorf("invalid path for %q templates", base)
-		}
-		return path, nil
-	}
-	return "", os.ErrNotExist
-}
-
 func generateClusterConfigMaps(m *metadata) error {
 	clusterGeneratedPath := filepath.Join(m.clusterDir, generatedPath)
 	if err := os.MkdirAll(clusterGeneratedPath, os.ModeDir|0755); err != nil {
@@ -134,15 +100,3 @@ func readClusterConfigStep(m *metadata) error {
 
 	return nil
 }
-
-func baseLocation() (string, error) {
-	ex, err := os.Executable()
-	if err != nil {
-		return "", fmt.Errorf("undetermined location of own executable: %s", err)
-	}
-	ex = path.Dir(ex)
-	if path.Base(ex) != binaryPrefix {
-		return "", fmt.Errorf("%s executable in unknown location: %s", path.Base(ex), err)
-	}
-	return path.Dir(ex), nil
-}
diff --git a/modules/aws/master/main.tf b/modules/aws/master/main.tf
index bbfd7284480..71dcb56d5f4 100644
--- a/modules/aws/master/main.tf
+++ b/modules/aws/master/main.tf
@@ -81,7 +81,7 @@ resource "aws_instance" "master" {
   iam_instance_profile = "${aws_iam_instance_profile.master.name}"
   instance_type        = "${var.ec2_type}"
   subnet_id            = "${element(var.subnet_ids, count.index)}"
-  user_data            = "${file(format("%s/%s", path.cwd, var.user_data_igns[count.index]))}"
+  user_data            = "${var.user_data_igns[count.index]}"
 
   vpc_security_group_ids      = ["${var.master_sg_ids}"]
   associate_public_ip_address = "${var.public_endpoints}"
diff --git a/modules/libvirt/volume/main.tf b/modules/libvirt/volume/main.tf
index d42cffd9d1e..73ea8166dc9 100644
--- a/modules/libvirt/volume/main.tf
+++ b/modules/libvirt/volume/main.tf
@@ -1,4 +1,4 @@
 resource "libvirt_volume" "coreos_base" {
   name   = "coreos_base"
-  source = "file://${var.image}"
+  source = "${var.image}"
 }
diff --git a/pkg/asset/cluster/BUILD.bazel b/pkg/asset/cluster/BUILD.bazel
index 957399ba6f4..c0fc52d15c5 100644
--- a/pkg/asset/cluster/BUILD.bazel
+++ b/pkg/asset/cluster/BUILD.bazel
@@ -3,9 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = [
+        "cluster.go",
         "doc.go",
         "stock.go",
-        "tfvar.go",
+        "tfvars.go",
     ],
     importpath = "github.com/openshift/installer/pkg/asset/cluster",
     visibility = ["//visibility:public"],
@@ -13,6 +14,8 @@ go_library(
         "//pkg/asset:go_default_library",
         "//pkg/asset/ignition:go_default_library",
         "//pkg/asset/installconfig:go_default_library",
+        "//pkg/asset/kubeconfig:go_default_library",
+        "//pkg/terraform:go_default_library",
         "//pkg/types/config:go_default_library",
     ],
 )
diff --git a/pkg/asset/cluster/cluster.go b/pkg/asset/cluster/cluster.go
new file mode 100644
index 00000000000..5c0563a292f
--- /dev/null
+++ b/pkg/asset/cluster/cluster.go
@@ -0,0 +1,91 @@
+package cluster
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+
+	"github.com/openshift/installer/pkg/asset"
+	"github.com/openshift/installer/pkg/terraform"
+	"github.com/openshift/installer/pkg/types/config"
+)
+
+const (
+	stateFileName = "terraform.state"
+)
+
+// Cluster uses the terraform executable to launch a cluster
+// with the given terraform tfvar and generated templates.
+type Cluster struct {
+	// The root directory of the generated assets.
+	rootDir    string
+	tfvars     asset.Asset
+	kubeconfig asset.Asset
+}
+
+var _ asset.Asset = (*Cluster)(nil)
+
+// Name returns the human-friendly name of the asset.
+func (c *Cluster) Name() string {
+	return "Cluster"
+}
+
+// Dependencies returns the direct dependency for launching
+// the cluster.
+func (c *Cluster) Dependencies() []asset.Asset {
+	return []asset.Asset{c.tfvars, c.kubeconfig}
+}
+
+// Generate launches the cluster and generates the terraform state file on disk.
+func (c *Cluster) Generate(parents map[asset.Asset]*asset.State) (*asset.State, error) {
+	dir, err := terraform.BaseLocation()
+	if err != nil {
+		return nil, err
+	}
+
+	state, ok := parents[c.tfvars]
+	if !ok {
+		return nil, fmt.Errorf("failed to get terraform.tfvar state in the parent asset states")
+	}
+
+	// Copy the terraform.tfvars to the working dir for the terraform.
+	if err := ioutil.WriteFile(filepath.Join(dir, state.Contents[0].Name), state.Contents[0].Data, 0600); err != nil {
+		return nil, fmt.Errorf("failed to write terraform.tfvars file: %v", err)
+	}
+
+	var tfvars config.Cluster
+	if err := json.Unmarshal(state.Contents[0].Data, &tfvars); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal terraform tfvars file: %v", err)
+	}
+
+	templateDir, err := terraform.FindStepTemplates(dir, terraform.InfraStep, tfvars.Platform)
+	if err != nil {
+		return nil, err
+	}
+
+	// This runs the terraform in the terraform template directory.
+	if err := terraform.Init(dir, templateDir); err != nil {
+		return nil, err
+	}
+
+	stateFile, err := terraform.Apply(dir, terraform.InfraStep, templateDir)
+	if err != nil {
+		return nil, err
+	}
+
+	data, err := ioutil.ReadFile(stateFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read tfstate file %q: %v", stateFile, err)
+	}
+
+	// TODO(yifan): Use the kubeconfig to verify the cluster is up.
+	return &asset.State{
+		Contents: []asset.Content{
+			{
+				Name: stateFileName,
+				Data: data,
+			},
+		},
+	}, nil
+}
diff --git a/pkg/asset/cluster/stock.go b/pkg/asset/cluster/stock.go
index 8418a8d1cc1..3cdedb50fc7 100644
--- a/pkg/asset/cluster/stock.go
+++ b/pkg/asset/cluster/stock.go
@@ -4,30 +4,42 @@ import (
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/ignition"
 	"github.com/openshift/installer/pkg/asset/installconfig"
+	"github.com/openshift/installer/pkg/asset/kubeconfig"
 )
 
 // Stock is the stock of the cluster assets that can be generated.
 type Stock interface {
 	// TFVars is the asset that generates the terraform.tfvar file
 	TFVars() asset.Asset
+	// Cluster is the asset that creates the cluster.
+	Cluster() asset.Asset
 }
 
 // StockImpl is the implementation of the cluster asset stock.
 type StockImpl struct {
-	tfvars asset.Asset
+	tfvars  asset.Asset
+	cluster asset.Asset
 }
 
 var _ Stock = (*StockImpl)(nil)
 
-// EstablishStock establishes the stock of assets.
-func (s *StockImpl) EstablishStock(installConfigStock installconfig.Stock, ignitionStock ignition.Stock) {
+// EstablishStock establishes the stock of assets in the specified directory.
+func (s *StockImpl) EstablishStock(installConfigStock installconfig.Stock, ignitionStock ignition.Stock, kubeconfigStock kubeconfig.Stock) {
 	s.tfvars = &TerraformVariables{
 		installConfig:     installConfigStock.InstallConfig(),
 		bootstrapIgnition: ignitionStock.BootstrapIgnition(),
 		masterIgnition:    ignitionStock.MasterIgnition(),
 		workerIgnition:    ignitionStock.WorkerIgnition(),
 	}
+
+	s.cluster = &Cluster{
+		tfvars:     s.tfvars,
+		kubeconfig: kubeconfigStock.KubeconfigAdmin(),
+	}
 }
 
 // TFVars returns the terraform tfvar asset.
 func (s *StockImpl) TFVars() asset.Asset { return s.tfvars }
+
+// Cluster returns the cluster asset.
+func (s *StockImpl) Cluster() asset.Asset { return s.cluster }
diff --git a/pkg/asset/cluster/tfvar.go b/pkg/asset/cluster/tfvars.go
similarity index 81%
rename from pkg/asset/cluster/tfvar.go
rename to pkg/asset/cluster/tfvars.go
index aa846299282..3ce0c964ae2 100644
--- a/pkg/asset/cluster/tfvar.go
+++ b/pkg/asset/cluster/tfvars.go
@@ -9,14 +9,14 @@ import (
 )
 
 const (
-	tfvarFilename  = "terraform.tfvar"
-	tfvarAssetName = "Terraform Variables"
+	tfvarsFilename  = "terraform.tfvars"
+	tfvarsAssetName = "Terraform Variables"
 )
 
 // TerraformVariables depends on InstallConfig and
 // Ignition to generate the terrafor.tfvars.
 type TerraformVariables struct {
-	// The Assets that this tfvar file depends.
+	// The Assets that this tfvars file depends.
 	installConfig     asset.Asset
 	bootstrapIgnition asset.Asset
 	masterIgnition    asset.Asset
@@ -27,7 +27,7 @@ var _ asset.Asset = (*TerraformVariables)(nil)
 
 // Name returns the human-friendly name of the asset.
 func (t *TerraformVariables) Name() string {
-	return tfvarAssetName
+	return tfvarsAssetName
 }
 
 // Dependencies returns the dependency of the TerraformVariable
@@ -35,7 +35,7 @@ func (t *TerraformVariables) Dependencies() []asset.Asset {
 	return []asset.Asset{t.installConfig, t.bootstrapIgnition, t.masterIgnition, t.workerIgnition}
 }
 
-// Generate generates the terraform.tfvar file.
+// Generate generates the terraform.tfvars file.
 func (t *TerraformVariables) Generate(parents map[asset.Asset]*asset.State) (*asset.State, error) {
 	installCfg, err := installconfig.GetInstallConfig(t.installConfig, parents)
 	if err != nil {
@@ -59,7 +59,7 @@ func (t *TerraformVariables) Generate(parents map[asset.Asset]*asset.State) (*as
 		}
 	}
 
-	cluster, err := config.ConvertInstallConfigToTFVar(installCfg, contents[t.bootstrapIgnition][0], contents[t.masterIgnition], contents[t.workerIgnition][0])
+	cluster, err := config.ConvertInstallConfigToTFVars(installCfg, contents[t.bootstrapIgnition][0], contents[t.masterIgnition], contents[t.workerIgnition][0])
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +72,7 @@ func (t *TerraformVariables) Generate(parents map[asset.Asset]*asset.State) (*as
 	return &asset.State{
 		Contents: []asset.Content{
 			{
-				Name: tfvarFilename,
+				Name: tfvarsFilename,
 				Data: []byte(data),
 			},
 		},
diff --git a/pkg/asset/installconfig/installconfig.go b/pkg/asset/installconfig/installconfig.go
index 043dc23f0f7..9a9d80bcfb6 100644
--- a/pkg/asset/installconfig/installconfig.go
+++ b/pkg/asset/installconfig/installconfig.go
@@ -17,6 +17,10 @@ import (
 var (
 	defaultServiceCIDR = parseCIDR("10.3.0.0/16")
 	defaultPodCIDR     = parseCIDR("10.2.0.0/16")
+	defaultVPCCIDR     = "10.0.0.0/16"
+
+	defaultLibvirtNetworkIfName  = "tt0"
+	defaultLibvirtNetworkIPRange = "192.168.124.0/24"
 )
 
 // installConfig generates the install-config.yml file.
@@ -63,6 +67,10 @@ func (a *installConfig) Generate(dependencies map[asset.Asset]*asset.State) (*as
 		},
 		BaseDomain: baseDomain,
 		Networking: types.Networking{
+			// TODO(yifan): Flannel is the temporal default network type for now,
+			// Need to update it to the new types.
+			Type: "flannel",
+
 			ServiceCIDR: ipnet.IPNet{
 				IPNet: defaultServiceCIDR,
 			},
@@ -89,12 +97,45 @@ func (a *installConfig) Generate(dependencies map[asset.Asset]*asset.State) (*as
 	case AWSPlatformType:
 		region := string(platformState.Contents[1].Data)
 		installConfig.AWS = &types.AWSPlatform{
-			Region: region,
+			Region:       region,
+			VPCCIDRBlock: defaultVPCCIDR,
+		}
+		// Set the default master and worker nodes to 3 for AWS.
+		installConfig.Machines = []types.MachinePool{
+			{
+				Name:     "master",
+				Replicas: func(x int64) *int64 { return &x }(3),
+			},
+			{
+				Name:     "worker",
+				Replicas: func(x int64) *int64 { return &x }(3),
+			},
 		}
 	case LibvirtPlatformType:
 		uri := string(platformState.Contents[1].Data)
+		image := string(platformState.Contents[2].Data)
+
 		installConfig.Libvirt = &types.LibvirtPlatform{
 			URI: uri,
+			Network: types.LibvirtNetwork{
+				Name:    clusterName,
+				IfName:  defaultLibvirtNetworkIfName,
+				IPRange: defaultLibvirtNetworkIPRange,
+			},
+			DefaultMachinePlatform: &types.LibvirtMachinePoolPlatform{
+				Image: image,
+			},
+		}
+		// Set the default master and worker nodes to 1 for AWS.
+		installConfig.Machines = []types.MachinePool{
+			{
+				Name:     "master",
+				Replicas: func(x int64) *int64 { return &x }(1),
+			},
+			{
+				Name:     "worker",
+				Replicas: func(x int64) *int64 { return &x }(1),
+			},
 		}
 	default:
 		return nil, fmt.Errorf("unknown platform type %q", platform)
diff --git a/pkg/asset/installconfig/installconfig_test.go b/pkg/asset/installconfig/installconfig_test.go
index 02da5cae732..12c3d6e8989 100644
--- a/pkg/asset/installconfig/installconfig_test.go
+++ b/pkg/asset/installconfig/installconfig_test.go
@@ -1,7 +1,6 @@
 package installconfig
 
 import (
-	"fmt"
 	"net"
 	"testing"
 
@@ -62,122 +61,6 @@ func TestInstallConfigDependencies(t *testing.T) {
 	assert.Equal(t, exp, act, "unexpected dependency")
 }
 
-func TestInstallConfigGenerate(t *testing.T) {
-	cases := []struct {
-		name                 string
-		platformContents     []string
-		expectedPlatformYaml string
-	}{
-		{
-			name: "aws",
-			platformContents: []string{
-				"aws",
-				"test-region",
-			},
-			expectedPlatformYaml: `  aws:
-    region: test-region
-    vpcCIDRBlock: ""
-    vpcID: ""`,
-		},
-		{
-			name: "libvirt",
-			platformContents: []string{
-				"libvirt",
-				"test-uri",
-			},
-			expectedPlatformYaml: `  libvirt:
-    URI: test-uri
-    masterIPs: null
-    network:
-      if: ""
-      ipRange: ""
-      name: ""`,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			stock := &StockImpl{
-				clusterID:    &testAsset{},
-				emailAddress: &testAsset{},
-				password:     &testAsset{},
-				sshKey:       &testAsset{},
-				baseDomain:   &testAsset{},
-				clusterName:  &testAsset{},
-				pullSecret:   &testAsset{},
-				platform:     &testAsset{},
-			}
-
-			installConfig := &installConfig{
-				assetStock: stock,
-			}
-
-			states := map[asset.Asset]*asset.State{
-				stock.clusterID: {
-					Contents: []asset.Content{{Data: []byte("test-cluster-id")}},
-				},
-				stock.emailAddress: {
-					Contents: []asset.Content{{Data: []byte("test-email")}},
-				},
-				stock.password: {
-					Contents: []asset.Content{{Data: []byte("test-password")}},
-				},
-				stock.sshKey: {
-					Contents: []asset.Content{{Data: []byte("test-sshkey")}},
-				},
-				stock.baseDomain: {
-					Contents: []asset.Content{{Data: []byte("test-domain")}},
-				},
-				stock.clusterName: {
-					Contents: []asset.Content{{Data: []byte("test-cluster-name")}},
-				},
-				stock.pullSecret: {
-					Contents: []asset.Content{{Data: []byte("test-pull-secret")}},
-				},
-				stock.platform: {
-					Contents: make([]asset.Content, len(tc.platformContents)),
-				},
-			}
-			for i, c := range tc.platformContents {
-				states[stock.platform].Contents[i].Data = []byte(c)
-			}
-
-			state, err := installConfig.Generate(states)
-			assert.NoError(t, err, "unexpected error generating asset")
-			assert.NotNil(t, state, "unexpected nil for asset state")
-
-			assert.Equal(t, 1, len(state.Contents), "unexpected number of contents in asset state")
-			assert.Equal(t, "install-config.yml", state.Contents[0].Name, "unexpected filename in asset state")
-
-			exp := fmt.Sprintf(`admin:
-  email: test-email
-  password: test-password
-  sshKey: test-sshkey
-baseDomain: test-domain
-clusterID: test-cluster-id
-machines:
-- name: master
-  platform: {}
-  replicas: 3
-- name: worker
-  platform: {}
-  replicas: 3
-metadata:
-  creationTimestamp: null
-  name: test-cluster-name
-networking:
-  podCIDR: 10.2.0.0/16
-  serviceCIDR: 10.3.0.0/16
-  type: ""
-platform:
-%s
-pullSecret: test-pull-secret
-`, tc.expectedPlatformYaml)
-
-			assert.Equal(t, exp, string(state.Contents[0].Data), "unexpected data in install-config.yml")
-		})
-	}
-}
-
 // TestClusterDNSIP tests the ClusterDNSIP function.
 func TestClusterDNSIP(t *testing.T) {
 	_, cidr, err := net.ParseCIDR("10.0.1.0/24")
diff --git a/pkg/asset/installconfig/platform.go b/pkg/asset/installconfig/platform.go
index 7abeca3cdd4..0caee73253a 100644
--- a/pkg/asset/installconfig/platform.go
+++ b/pkg/asset/installconfig/platform.go
@@ -102,16 +102,23 @@ func (a *Platform) awsPlatform() (*asset.State, error) {
 }
 
 func (a *Platform) libvirtPlatform() (*asset.State, error) {
-	var uri string
+	var uri, image string
 	survey.AskOne(&survey.Input{
 		Message: "URI",
 		Help:    "The libvirt connection URI to be used. This must be accessible from the running cluster.",
 		Default: "qemu+tcp://192.168.122.1/system",
 	}, &uri, nil)
 
+	survey.AskOne(&survey.Input{
+		Message: "Image",
+		Help:    "The URL to the OS image.",
+		Default: "",
+	}, &image, nil)
+
 	return assetStateForStringContents(
 		LibvirtPlatformType,
 		uri,
+		image,
 	), nil
 }
 
diff --git a/pkg/asset/stock/stock.go b/pkg/asset/stock/stock.go
index e6c5b32caa7..7ca887cfd18 100644
--- a/pkg/asset/stock/stock.go
+++ b/pkg/asset/stock/stock.go
@@ -51,9 +51,10 @@ func EstablishStock() *Stock {
 	s.installConfigStock.EstablishStock()
 	s.tlsStock.EstablishStock(&s.installConfigStock)
 	s.kubeconfigStock.EstablishStock(&s.installConfigStock, &s.tlsStock)
-	s.clusterStock.EstablishStock(s, s)
 	s.manifestsStock.EstablishStock(&s.installConfigStock, s, s)
 	s.ignitionStock.EstablishStock(s, s, s, s)
+	s.clusterStock.EstablishStock(s, s, s)
+	s.manifestsStock.EstablishStock(&s.installConfigStock, s, s)
 
 	return s
 }
diff --git a/pkg/terraform/BUILD.bazel b/pkg/terraform/BUILD.bazel
new file mode 100644
index 00000000000..516a290f965
--- /dev/null
+++ b/pkg/terraform/BUILD.bazel
@@ -0,0 +1,13 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "doc.go",
+        "executor.go",
+        "terraform.go",
+    ],
+    importpath = "github.com/openshift/installer/pkg/terraform",
+    visibility = ["//visibility:public"],
+    deps = ["//pkg/types/config:go_default_library"],
+)
diff --git a/pkg/terraform/doc.go b/pkg/terraform/doc.go
new file mode 100644
index 00000000000..5a35d55d21d
--- /dev/null
+++ b/pkg/terraform/doc.go
@@ -0,0 +1,4 @@
+// Package terraform contains the utilities that's used for invoking
+// terraform executable under the given directory with the given
+// templates.
+package terraform
diff --git a/installer/pkg/workflow/executor.go b/pkg/terraform/executor.go
similarity index 99%
rename from installer/pkg/workflow/executor.go
rename to pkg/terraform/executor.go
index 77e74f9a691..295a0b80799 100644
--- a/installer/pkg/workflow/executor.go
+++ b/pkg/terraform/executor.go
@@ -1,4 +1,4 @@
-package workflow
+package terraform
 
 import (
 	"errors"
diff --git a/pkg/terraform/terraform.go b/pkg/terraform/terraform.go
new file mode 100644
index 00000000000..d24003ab9b2
--- /dev/null
+++ b/pkg/terraform/terraform.go
@@ -0,0 +1,116 @@
+package terraform
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/openshift/installer/pkg/types/config"
+)
+
+const (
+	// AssetsStep is the name of the step that generates the assets.
+	// This is deprecated.
+	// TODO(yifan) Remove this when removing the asset step.
+	AssetsStep = "assets"
+
+	// InfraStep is the name of the step that sets up infra.
+	InfraStep = "infra"
+
+	stepsBaseDir = "steps"
+)
+
+func terraformExec(clusterDir string, args ...string) error {
+	// Create an executor
+	ex, err := newExecutor()
+	if err != nil {
+		return fmt.Errorf("could not create Terraform executor: %s", err)
+	}
+
+	err = ex.execute(clusterDir, args...)
+	if err != nil {
+		return fmt.Errorf("failed to run Terraform: %s", err)
+	}
+	return nil
+}
+
+// Apply runs "terraform apply" with the given clusterDir, templateDir and extra args.
+// It returns the absolute path of the tfstate file.
+func Apply(clusterDir string, state string, templateDir string, extraArgs ...string) (string, error) {
+	stateFileName := fmt.Sprintf("%s.tfstate", state)
+	defaultArgs := []string{
+		"apply",
+		"-auto-approve",
+		fmt.Sprintf("-state=%s", stateFileName),
+	}
+	extraArgs = append(extraArgs, templateDir)
+	args := append(defaultArgs, extraArgs...)
+
+	return path.Join(clusterDir, stateFileName), terraformExec(clusterDir, args...)
+}
+
+// Destroy runs "terraform destory" with the given clusterDir, templateDir, state file
+// and extra args.
+func Destroy(clusterDir, state, templateDir string, extraArgs ...string) error {
+	defaultArgs := []string{
+		"destroy",
+		"-force",
+		fmt.Sprintf("-state=%s.tfstate", state),
+	}
+	extraArgs = append(extraArgs, templateDir)
+	args := append(defaultArgs, extraArgs...)
+	return terraformExec(clusterDir, args...)
+}
+
+// Init runs "terraform init" with the given clusterDir and templateDir.
+func Init(clusterDir, templateDir string) error {
+	return terraformExec(clusterDir, "init", templateDir)
+}
+
+// HasStateFile returns true if the stateFile exists under stateDir.
+func HasStateFile(stateDir string, stateFile string) bool {
+	stepStateFile := filepath.Join(stateDir, fmt.Sprintf("%s.tfstate", stateFile))
+	_, err := os.Stat(stepStateFile)
+	return !os.IsNotExist(err)
+}
+
+// FindStepTemplates returns the directory containing templates for a given step.
+// If platform is specified, it looks for a subdirectory with platform first,
+// falling back if there are no platform-specific templates for that step.
+func FindStepTemplates(dir, stepName string, platform config.Platform) (string, error) {
+	stepDir := filepath.Join(dir, stepsBaseDir, stepName)
+	for _, path := range []string{
+		filepath.Join(stepDir, string(platform)),
+		stepDir} {
+
+		stat, err := os.Stat(path)
+		if err != nil {
+			if os.IsNotExist(err) {
+				continue
+			}
+			return "", fmt.Errorf("invalid path for %q templates: %s", path, err)
+		}
+		if !stat.IsDir() {
+			return "", fmt.Errorf("invalid path for %q templates", path)
+		}
+		return path, nil
+	}
+	return "", os.ErrNotExist
+}
+
+// BaseLocation returns the location of the parent directory of the binary
+// that has the terraform templates.
+// TODO(yifan): Get rid of this when moving off building with bazel.
+func BaseLocation() (string, error) {
+	ex, err := os.Executable()
+	if err != nil {
+		return "", fmt.Errorf("undetermined location of own executable: %s", err)
+	}
+	ex = filepath.Dir(ex)
+	// TODO(yifan): Hardcode the parent dir name for now.
+	if filepath.Base(ex) != "installer" {
+		return "", fmt.Errorf("%s executable in unknown location: %s", filepath.Base(ex), err)
+	}
+	return filepath.Dir(ex), nil
+}
diff --git a/pkg/types/config/cluster.go b/pkg/types/config/cluster.go
index 5b863877f3b..7699298ff02 100644
--- a/pkg/types/config/cluster.go
+++ b/pkg/types/config/cluster.go
@@ -13,11 +13,6 @@ import (
 )
 
 const (
-	// IgnitionPathMaster is the relative path to the ign master cfg from the tf working directory
-	// This is a format string so that the index can be populated later
-	IgnitionPathMaster = "master-%d.ign"
-	// IgnitionPathWorker is the relative path to the ign worker cfg from the tf working directory
-	IgnitionPathWorker = "worker.ign"
 	// PlatformAWS is the platform for a cluster launched on AWS.
 	PlatformAWS Platform = "aws"
 	// PlatformLibvirt is the platform for a cluster launched on libvirt.
@@ -75,14 +70,9 @@ type Cluster struct {
 	BaseDomain string `json:"tectonic_base_domain,omitempty" yaml:"baseDomain,omitempty"`
 	CA         `json:",inline" yaml:"CA,omitempty"`
 
-	// Deprecated, will be removed soon.
-	IgnitionMasterPaths []string `json:"tectonic_ignition_masters,omitempty" yaml:"-"`
-	// Deprecated, will be removed soon.
-	IgnitionWorkerPath string `json:"tectonic_ignition_worker,omitempty" yaml:"-"`
-
-	IgnitionBootstrap string   `json:"openshift_ignition_bootstrap,omitempty" yaml:"-"`
-	IgnitionMasters   []string `json:"openshift_ignition_master,omitempty" yaml:"-"`
-	IgnitionWorker    string   `json:"openshift_ignition_worker,omitempty" yaml:"-"`
+	IgnitionBootstrap string   `json:"ignition_bootstrap,omitempty" yaml:"-"`
+	IgnitionMasters   []string `json:"ignition_masters,omitempty" yaml:"-"`
+	IgnitionWorker    string   `json:"ignition_worker,omitempty" yaml:"-"`
 
 	Internal        `json:",inline" yaml:"-"`
 	libvirt.Libvirt `json:",inline" yaml:"libvirt,omitempty"`
@@ -116,13 +106,7 @@ func (c *Cluster) TFVars() (string, error) {
 	c.Master.Count = c.NodeCount(c.Master.NodePools)
 	c.Worker.Count = c.NodeCount(c.Worker.NodePools)
 
-	for i := 0; i < c.Master.Count; i++ {
-		c.IgnitionMasterPaths = append(c.IgnitionMasterPaths, fmt.Sprintf(IgnitionPathMaster, i))
-	}
-
-	c.IgnitionWorkerPath = IgnitionPathWorker
-
-	// fill in master ips
+	// Fill in master ips
 	if c.Platform == PlatformLibvirt {
 		if err := c.Libvirt.TFVars(c.Master.Count, c.Worker.Count); err != nil {
 			return "", err
@@ -159,10 +143,10 @@ func (c *Cluster) YAML() (string, error) {
 	return string(yaml), nil
 }
 
-// ConvertInstallConfigToTFVar converts the installconfig to the Cluster struct
+// ConvertInstallConfigToTFVars converts the installconfig to the Cluster struct
 // that represents the terraform.tfvar file.
 // TODO(yifan): Clean up the Cluster struct to trim unnecessary fields.
-func ConvertInstallConfigToTFVar(cfg *types.InstallConfig, bootstrapIgn string, masterIgns []string, workerIgn string) (*Cluster, error) {
+func ConvertInstallConfigToTFVars(cfg *types.InstallConfig, bootstrapIgn string, masterIgns []string, workerIgn string) (*Cluster, error) {
 	cluster := &Cluster{
 		Admin: Admin{
 			Email:    cfg.Admin.Email,
@@ -182,6 +166,8 @@ func ConvertInstallConfigToTFVar(cfg *types.InstallConfig, bootstrapIgn string,
 			Type:        tectonicnetwork.NetworkType(cfg.Networking.Type),
 			ServiceCIDR: cfg.Networking.ServiceCIDR.String(),
 			PodCIDR:     cfg.Networking.PodCIDR.String(),
+			// TODO(yifan): Remove this when we drop the old installer binary.
+			MTU: "1480",
 		},
 		BaseDomain: cfg.BaseDomain,
 		Name:       cfg.Name,
@@ -191,6 +177,8 @@ func ConvertInstallConfigToTFVar(cfg *types.InstallConfig, bootstrapIgn string,
 	if cfg.Platform.AWS != nil {
 		cluster.Platform = PlatformAWS
 		cluster.AWS = aws.AWS{
+			Endpoints: aws.EndpointsAll,   // Default value for endpoints.
+			Profile:   aws.DefaultProfile, // Default value for profile.
 			Region:    cfg.Platform.AWS.Region,
 			ExtraTags: cfg.Platform.AWS.UserTags,
 			External: aws.External{
@@ -211,6 +199,7 @@ func ConvertInstallConfigToTFVar(cfg *types.InstallConfig, bootstrapIgn string,
 				IfName:  cfg.Platform.Libvirt.Network.IfName,
 				IPRange: cfg.Platform.Libvirt.Network.IPRange,
 			},
+			Image:     cfg.Platform.Libvirt.DefaultMachinePlatform.Image,
 			MasterIPs: masterIPs,
 		}
 	}
@@ -261,5 +250,10 @@ func ConvertInstallConfigToTFVar(cfg *types.InstallConfig, bootstrapIgn string,
 
 	}
 
+	// Validate the TFVars.
+	if err := cluster.ValidateAndLog(); err != nil {
+		return nil, err
+	}
+
 	return cluster, nil
 }
diff --git a/pkg/types/machinepools.go b/pkg/types/machinepools.go
index 64b21fa6773..f8fd23d936e 100644
--- a/pkg/types/machinepools.go
+++ b/pkg/types/machinepools.go
@@ -52,8 +52,12 @@ type EC2RootVolume struct {
 type LibvirtMachinePoolPlatform struct {
 	// ImagePool is the name of the libvirt storage pool to which the storage
 	// volume containing the OS image belongs.
-	ImagePool string `json:"imagePool"`
+	ImagePool string `json:"imagePool,omitempty"`
 	// ImageVolume is the name of the libvirt storage volume containing the OS
 	// image.
-	ImageVolume string `json:"imageVolume"`
+	ImageVolume string `json:"imageVolume,omitempty"`
+
+	// Image is the URL to the OS image.
+	// E.g. "http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/latest/rhcos-qemu.qcow2.gz"
+	Image string `json:"image"`
 }
diff --git a/steps/assets/aws/main.tf b/steps/assets/aws/main.tf
index 3419a3c71c5..783d1683584 100644
--- a/steps/assets/aws/main.tf
+++ b/steps/assets/aws/main.tf
@@ -20,5 +20,5 @@ module assets_base {
   tectonic_service_cidr         = "${var.tectonic_service_cidr}"
   tectonic_update_channel       = "${var.tectonic_update_channel}"
   tectonic_versions             = "${var.tectonic_versions}"
-  aws_worker_ign_config         = "${file("worker.ign")}"
+  aws_worker_ign_config         = "${var.ignition_worker}"
 }
diff --git a/steps/infra/aws/inputs.tf b/steps/infra/aws/inputs.tf
index ade2b1619a0..7ae2b86caba 100644
--- a/steps/infra/aws/inputs.tf
+++ b/steps/infra/aws/inputs.tf
@@ -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}"
 }
diff --git a/steps/infra/aws/main.tf b/steps/infra/aws/main.tf
index 55b26035d89..fc5b8dce50e 100644
--- a/steps/infra/aws/main.tf
+++ b/steps/infra/aws/main.tf
@@ -57,7 +57,7 @@ module "masters" {
   root_volume_type    = "${var.tectonic_aws_master_root_volume_type}"
   subnet_ids          = "${module.vpc.master_subnet_ids}"
   ec2_ami             = "${var.tectonic_aws_ec2_ami_override}"
-  user_data_igns      = "${var.tectonic_ignition_masters}"
+  user_data_igns      = ["${var.ignition_masters}"]
 }
 
 module "iam" {
diff --git a/steps/infra/libvirt/inputs.tf b/steps/infra/libvirt/inputs.tf
index ade2b1619a0..408a8c9a65d 100644
--- a/steps/infra/libvirt/inputs.tf
+++ b/steps/infra/libvirt/inputs.tf
@@ -4,8 +4,12 @@ data "terraform_remote_state" "assets" {
   config {
     path = "${path.cwd}/assets.tfstate"
   }
+
+  defaults {
+    ignition_bootstrap = ""
+  }
 }
 
 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}"
 }
diff --git a/steps/infra/libvirt/main.tf b/steps/infra/libvirt/main.tf
index 3a480733a39..c63600d2827 100644
--- a/steps/infra/libvirt/main.tf
+++ b/steps/infra/libvirt/main.tf
@@ -27,12 +27,12 @@ resource "libvirt_volume" "master" {
 resource "libvirt_ignition" "master" {
   count   = "${var.tectonic_master_count}"
   name    = "master-${count.index}.ign"
-  content = "${file(format("%s/%s", path.cwd, var.tectonic_ignition_masters[count.index]))}"
+  content = "${var.ignition_masters[count.index]}"
 }
 
 resource "libvirt_ignition" "worker" {
   name    = "worker.ign"
-  content = "${file("${path.cwd}/${var.tectonic_ignition_worker}")}"
+  content = "${var.ignition_worker}"
 }
 
 resource "libvirt_network" "tectonic_net" {