Browse Source
do not apply floating IP's before router port is created (#6887)
pull/6897/head
Hugo Blom
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
11 additions and
0 deletions
-
contrib/terraform/openstack/kubespray.tf
-
contrib/terraform/openstack/modules/ips/main.tf
-
contrib/terraform/openstack/modules/ips/variables.tf
-
contrib/terraform/openstack/variables.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" { |
|
|
|
|
|
@ -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. |
|
|
|
|
|
@ -19,3 +19,5 @@ variable "router_id" { |
|
|
|
variable "k8s_nodes" {} |
|
|
|
|
|
|
|
variable "k8s_master_fips" {} |
|
|
|
|
|
|
|
variable "router_internal_port_id" {} |
|
|
@ -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 = {} |
|
|
|
} |
|
|
|