C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

do not apply floating IP's before router port is created (#6887)

Browse source
This commit is contained in:
Hugo Blom 2020-11-06 09:16:50 +01:00 committed by GitHub
parent 93a1693040
commit 1b0326f773
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/terraform/openstack/kubespray.tf
View file

@ -28,6 +28,7 @@ module "ips" {
router_id = module.network.router_id router_id = module.network.router_id
k8s_nodes = var.k8s_nodes k8s_nodes = var.k8s_nodes
k8s_master_fips = var.k8s_master_fips k8s_master_fips = var.k8s_master_fips
router_internal_port_id = module.network.router_internal_port_id
} }
module "compute" { module "compute" {

3
contrib/terraform/openstack/modules/ips/main.tf
View file

@ -2,6 +2,9 @@ resource "null_resource" "dummy_dependency" {
triggers = { triggers = {
dependency_id = var.router_id 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. # If user specifies pre-existing IPs to use in k8s_master_fips, do not create new ones.

2
contrib/terraform/openstack/modules/ips/variables.tf
View file

@ -19,3 +19,5 @@ variable "router_id" {
variable "k8s_nodes" {} variable "k8s_nodes" {}
variable "k8s_master_fips" {} variable "k8s_master_fips" {}
variable "router_internal_port_id" {}

5
contrib/terraform/openstack/variables.tf
View file

@ -242,6 +242,11 @@ variable "router_id" {
default = null default = null
} }
variable "router_internal_port_id" {
description = "uuid of the port connection our router to our network"
default = null
}
variable "k8s_nodes" { variable "k8s_nodes" {
default = {} default = {}
} }