Merge pull request openshift#7111 from shiftstack/bootstrap-support-multiple-subnet

OpenStack: add support to multiple subnets in the bootstrap

Author: openshift-merge-robot

data/data/openstack/bootstrap/main.tf

@@ -48,8 +48,13 @@ resource "openstack_networking_port_v2" "bootstrap_port" {
     value = var.cluster_domain
   }
 
-  fixed_ip {
-    subnet_id = var.nodes_subnet_id
+  dynamic "fixed_ip" {
+    for_each = var.nodes_default_port.fixed_ips
+
+    content {
+      subnet_id  = fixed_ip.value["subnet_id"]
+      ip_address = fixed_ip.value["ip_address"]
+    }
   }
 
   dynamic "allowed_address_pairs" {

data/data/openstack/bootstrap/variables.tf

@@ -7,8 +7,14 @@ variable "private_network_id" {
   type = string
 }
 
-variable "nodes_subnet_id" {
-  type = string
+variable "nodes_default_port" {
+  type = object({
+    network_id = string
+    fixed_ips = list(object({
+      subnet_id  = string
+      ip_address = string
+    }))
+  })
 }
 
 variable "master_port_ids" {

data/data/openstack/masters/outputs.tf

@@ -21,6 +21,6 @@ output "private_network_id" {
   value = local.nodes_default_port.network_id
 }
 
-output "nodes_subnet_id" {
-  value = local.nodes_default_port.fixed_ips[0].subnet_id
+output "nodes_default_port" {
+  value = local.nodes_default_port
 }