diff --git a/contrib/terraform/openstack/kubespray.tf b/contrib/terraform/openstack/kubespray.tf index 424c134dde8..c32659f968c 100644 --- a/contrib/terraform/openstack/kubespray.tf +++ b/contrib/terraform/openstack/kubespray.tf @@ -24,6 +24,7 @@ module "ips" { router_id = module.network.router_id k8s_nodes = var.k8s_nodes k8s_master_fips = var.k8s_master_fips + bastion_fips = var.bastion_fips router_internal_port_id = module.network.router_internal_port_id } diff --git a/contrib/terraform/openstack/modules/ips/main.tf b/contrib/terraform/openstack/modules/ips/main.tf index c7fcf700cae..243572162f2 100644 --- a/contrib/terraform/openstack/modules/ips/main.tf +++ b/contrib/terraform/openstack/modules/ips/main.tf @@ -28,7 +28,7 @@ resource "openstack_networking_floatingip_v2" "k8s_node" { } resource "openstack_networking_floatingip_v2" "bastion" { - count = var.number_of_bastions + count = length(var.bastion_fips) > 0 ? 0 : var.number_of_bastions pool = var.floatingip_pool depends_on = [null_resource.dummy_dependency] } diff --git a/contrib/terraform/openstack/modules/ips/outputs.tf b/contrib/terraform/openstack/modules/ips/outputs.tf index 98754914014..591cac2502f 100644 --- a/contrib/terraform/openstack/modules/ips/outputs.tf +++ b/contrib/terraform/openstack/modules/ips/outputs.tf @@ -17,5 +17,5 @@ output "k8s_nodes_fips" { } output "bastion_fips" { - value = openstack_networking_floatingip_v2.bastion[*].address + value = length(var.bastion_fips) > 0 ? var.bastion_fips : openstack_networking_floatingip_v2.bastion[*].address } diff --git a/contrib/terraform/openstack/modules/ips/variables.tf b/contrib/terraform/openstack/modules/ips/variables.tf index c5fd6b7f40d..a30fffde025 100644 --- a/contrib/terraform/openstack/modules/ips/variables.tf +++ b/contrib/terraform/openstack/modules/ips/variables.tf @@ -20,4 +20,6 @@ variable "k8s_nodes" {} variable "k8s_master_fips" {} +variable "bastion_fips" {} + variable "router_internal_port_id" {} diff --git a/contrib/terraform/openstack/variables.tf b/contrib/terraform/openstack/variables.tf index a6c3c6408db..99b57db69b1 100644 --- a/contrib/terraform/openstack/variables.tf +++ b/contrib/terraform/openstack/variables.tf @@ -162,6 +162,12 @@ variable "k8s_master_fips" { default = [] } +variable "bastion_fips" { + description = "specific pre-existing floating IPs to use for bastion node" + type = list(string) + default = [] +} + variable "floatingip_pool" { description = "name of the floating ip pool to use" default = "external"