Baremetal: Split terraform into stages

bootstrap: create bootstrap resources
masters: create permanent cluster resources

This is needed for Terraform v0.14.6 and later since Terraform deletions now
destroy all resource dependencies.

data/data/baremetal/bootstrap/main.tf

@@ -1,3 +1,19 @@
+provider "libvirt" {
+  uri = var.libvirt_uri
+}
+
+provider "ironic" {
+  url                = var.ironic_uri
+  inspector          = var.inspector_uri
+  microversion       = "1.56"
+  timeout            = 3600
+  auth_strategy      = "http_basic"
+  ironic_username    = var.ironic_username
+  ironic_password    = var.ironic_password
+  inspector_username = var.ironic_username
+  inspector_password = var.ironic_password
+}
+
 resource "libvirt_pool" "bootstrap" {
   name = "${var.cluster_id}-bootstrap"
   type = "dir"
@@ -7,7 +23,7 @@ resource "libvirt_pool" "bootstrap" {
 resource "libvirt_volume" "bootstrap-base" {
   name   = "${var.cluster_id}-bootstrap-base"
   pool   = libvirt_pool.bootstrap.name
-  source = var.image
+  source = var.bootstrap_os_image
 }
 
 resource "libvirt_volume" "bootstrap" {
@@ -22,7 +38,7 @@ resource "libvirt_volume" "bootstrap" {
 resource "libvirt_ignition" "bootstrap" {
   name    = "${var.cluster_id}-bootstrap.ign"
   pool    = libvirt_pool.bootstrap.name
-  content = var.ignition
+  content = var.ignition_bootstrap
 }
 
 resource "libvirt_domain" "bootstrap" {

data/data/baremetal/masters/main.tf

@@ -1,3 +1,19 @@
+provider "libvirt" {
+  uri = var.libvirt_uri
+}
+
+provider "ironic" {
+  url                = var.ironic_uri
+  inspector          = var.inspector_uri
+  microversion       = "1.56"
+  timeout            = 3600
+  auth_strategy      = "http_basic"
+  ironic_username    = var.ironic_username
+  ironic_password    = var.ironic_password
+  inspector_username = var.ironic_username
+  inspector_password = var.ironic_password
+}
+
 resource "ironic_node_v1" "openshift-master-host" {
   count          = var.master_count
   name           = var.hosts[count.index]["name"]
@@ -35,7 +51,7 @@ resource "ironic_deployment" "openshift-master-deployment" {
   )
 
   instance_info = var.instance_infos[count.index]
-  user_data     = var.ignition
+  user_data     = var.ignition_master
 }
 
 data "ironic_introspection" "openshift-master-introspection" {

pkg/terraform/stages/baremetal/stages.go

@@ -0,0 +1,13 @@
+package baremetal
+
+import (
+	"github.com/openshift/installer/pkg/terraform"
+	"github.com/openshift/installer/pkg/terraform/stages"
+)
+
+// PlatformStages are the stages to run to provision the infrastructure in
+// Bare Metal.
+var PlatformStages = []terraform.Stage{
+	stages.NewStage("baremetal", "bootstrap", stages.WithNormalDestroy()),
+	stages.NewStage("baremetal", "masters"),
+}

pkg/terraform/stages/compat/stage.go

@@ -9,15 +9,13 @@ import (
 
 	"github.com/openshift/installer/pkg/terraform"
 	gatherazure "github.com/openshift/installer/pkg/terraform/gather/azure"
-	gatherbaremetal "github.com/openshift/installer/pkg/terraform/gather/baremetal"
 	gatherkubevirt "github.com/openshift/installer/pkg/terraform/gather/kubevirt"
 	gatherlibvirt "github.com/openshift/installer/pkg/terraform/gather/libvirt"
 	gatheropenstack "github.com/openshift/installer/pkg/terraform/gather/openstack"
 	gatherovirt "github.com/openshift/installer/pkg/terraform/gather/ovirt"
 	gathervsphere "github.com/openshift/installer/pkg/terraform/gather/vsphere"
 	"github.com/openshift/installer/pkg/types"
 	azuretypes "github.com/openshift/installer/pkg/types/azure"
-	baremetaltypes "github.com/openshift/installer/pkg/types/baremetal"
 	kubevirttypes "github.com/openshift/installer/pkg/types/kubevirt"
 	libvirttypes "github.com/openshift/installer/pkg/types/libvirt"
 	openstacktypes "github.com/openshift/installer/pkg/types/openstack"
@@ -97,12 +95,6 @@ func extractHostAddresses(config *types.InstallConfig, tfstate *terraform.State)
 		if err != nil {
 			logrus.Error(err)
 		}
-	case baremetaltypes.Name:
-		bootstrap = config.Platform.BareMetal.BootstrapProvisioningIP
-		masters, err = gatherbaremetal.ControlPlaneIPs(config, tfstate)
-		if err != nil {
-			return
-		}
 	case libvirttypes.Name:
 		bootstrap, err = gatherlibvirt.BootstrapIP(tfstate)
 		if err != nil {

pkg/terraform/stages/platform/stages.go

@@ -6,6 +6,7 @@ import (
 	"github.com/openshift/installer/pkg/terraform/stages/compat"
 	"github.com/openshift/installer/pkg/terraform/stages/gcp"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
+	baremetaltypes "github.com/openshift/installer/pkg/types/baremetal"
 	gcptypes "github.com/openshift/installer/pkg/types/gcp"
 )
 
@@ -14,6 +15,8 @@ func StagesForPlatform(platform string) []terraform.Stage {
 	switch platform {
 	case awstypes.Name:
 		return aws.PlatformStages
+	case baremetaltypes.Name:
+		return baremetal.PlatformStages
 	case gcptypes.Name:
 		return gcp.PlatformStages
 	default: