diff --git a/contrib/terraform/openstack/kubespray.tf b/contrib/terraform/openstack/kubespray.tf index 90aad989c608e58494a629aa0215e35ac06b71c7..7628996ccf933bc8328745a45bc25ef0ff14dbc9 100644 --- a/contrib/terraform/openstack/kubespray.tf +++ b/contrib/terraform/openstack/kubespray.tf @@ -28,6 +28,7 @@ module "ips" { router_id = module.network.router_id k8s_nodes = var.k8s_nodes k8s_master_fips = var.k8s_master_fips + router_internal_port_id = module.network.router_internal_port_id } module "compute" { diff --git a/contrib/terraform/openstack/modules/ips/main.tf b/contrib/terraform/openstack/modules/ips/main.tf index 9f98df7a5576f4b1e5ea32fdd957ed410e9df5d4..c7fcf700cae24034d4bc2c3a3a5d16db1878e5e8 100644 --- a/contrib/terraform/openstack/modules/ips/main.tf +++ b/contrib/terraform/openstack/modules/ips/main.tf @@ -2,6 +2,9 @@ resource "null_resource" "dummy_dependency" { triggers = { dependency_id = var.router_id } + depends_on = [ + var.router_internal_port_id + ] } # If user specifies pre-existing IPs to use in k8s_master_fips, do not create new ones. diff --git a/contrib/terraform/openstack/modules/ips/variables.tf b/contrib/terraform/openstack/modules/ips/variables.tf index d1fb9c5b380f64b08dec9698078b7ae5bcd14d37..c5fd6b7f40d2a4fec952926169958aa19424609d 100644 --- a/contrib/terraform/openstack/modules/ips/variables.tf +++ b/contrib/terraform/openstack/modules/ips/variables.tf @@ -19,3 +19,5 @@ variable "router_id" { variable "k8s_nodes" {} variable "k8s_master_fips" {} + +variable "router_internal_port_id" {} diff --git a/contrib/terraform/openstack/variables.tf b/contrib/terraform/openstack/variables.tf index 5b49b29428180205748f226b4802fb02e66d4c1d..48b2ea88de23bc3e1c54c9464bdca7a8e16efc00 100644 --- a/contrib/terraform/openstack/variables.tf +++ b/contrib/terraform/openstack/variables.tf @@ -242,6 +242,11 @@ variable "router_id" { default = null } +variable "router_internal_port_id" { + description = "uuid of the port connection our router to our network" + default = null +} + variable "k8s_nodes" { default = {} }