Merge pull request #8117 from honza/remove-bm-tf

METAL-871: baremetal: remove ironic tf files

Author: openshift-merge-bot[bot]

data/data/baremetal/masters/main.tf

@@ -1,13 +1,3 @@
-variable "ironic_uri" {
-  type        = string
-  description = "URI for accessing the Ironic REST API"
-}
-
-variable "inspector_uri" {
-  type        = string
-  description = "URI for accessing the Ironic Inspector REST API"
-}
-
 variable "libvirt_uri" {
   type        = string
   description = "libvirt connection URI"
@@ -18,47 +8,7 @@ variable "bootstrap_os_image" {
   description = "The URL of the bootstrap OS disk image"
 }
 
-variable "ironic_username" {
-  type        = string
-  description = "Username for authentication to Ironic"
-}
-
-variable "ironic_password" {
-  type        = string
-  description = "Password for authentication to Ironic"
-}
-
-variable "masters" {
-  type        = list(map(string))
-  description = "Hardware details for masters"
-}
-
 variable "bridges" {
   type        = list(map(string))
   description = "A list of network bridge maps, containing the interface name and optionally the MAC address"
 }
-
-variable "properties" {
-  type        = list(map(string))
-  description = "Properties for masters"
-}
-
-variable "root_devices" {
-  type        = list(map(string))
-  description = "Root devices for masters"
-}
-
-variable "driver_infos" {
-  type        = list(map(string))
-  description = "BMC information for masters"
-}
-
-variable "instance_infos" {
-  type        = list(map(string))
-  description = "Instance information for masters"
-}
-
-variable "deploy_steps" {
-  type        = list(string)
-  description = "The contents of custom deploy steps for the node in JSON format"
-}

data/data/baremetal/masters/outputs.tf

@@ -775,29 +775,13 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 			Data:     data,
 		})
 	case baremetal.Name:
-		var imageCacheIP string
-		if installConfig.Config.Platform.BareMetal.ProvisioningNetwork == baremetal.DisabledProvisioningNetwork {
-			imageCacheIP = installConfig.Config.Platform.BareMetal.APIVIPs[0]
-		} else {
-			imageCacheIP = installConfig.Config.Platform.BareMetal.BootstrapProvisioningIP
-		}
-
 		data, err = baremetaltfvars.TFVars(
-			*installConfig.Config.ControlPlane.Replicas,
 			installConfig.Config.Platform.BareMetal.LibvirtURI,
-			installConfig.Config.Platform.BareMetal.APIVIPs,
-			imageCacheIP,
 			string(*rhcosBootstrapImage),
 			installConfig.Config.Platform.BareMetal.ExternalBridge,
 			installConfig.Config.Platform.BareMetal.ExternalMACAddress,
 			installConfig.Config.Platform.BareMetal.ProvisioningBridge,
 			installConfig.Config.Platform.BareMetal.ProvisioningMACAddress,
-			installConfig.Config.Platform.BareMetal.Hosts,
-			mastersAsset.HostFiles,
-			string(*rhcosImage),
-			ironicCreds.Username,
-			ironicCreds.Password,
-			masterIgn,
 		)
 		if err != nil {
 			return errors.Wrapf(err, "failed to get %s Terraform variables", platform)