Skip to content

Commit

Permalink
Set same additional networks on Bootstrap as Control Plane
Browse files Browse the repository at this point in the history
The bootstrap node was only being attached to the private network created by the installer,
causing deployments with more advanced networking topologies that made use of the additional
networking feature to fail. The bootstrap needs to be attached to the same networks as the
control plane nodes in order to guarantee the install will succeed.

Fixes Bug 1908583
  • Loading branch information
Emilio Garcia committed Jan 8, 2021
1 parent 8a70e97 commit 57d4e4d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
8 changes: 8 additions & 0 deletions data/data/openstack/bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ resource "openstack_compute_instance_v2" "bootstrap" {
port = openstack_networking_port_v2.bootstrap_port.id
}

dynamic network {
for_each = var.additional_network_ids

content {
uuid = network.value
}
}

tags = ["openshiftClusterID=${var.cluster_id}"]

metadata = {
Expand Down
5 changes: 5 additions & 0 deletions data/data/openstack/bootstrap/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,8 @@ variable "zone" {
type = string
description = "Availability Zone to schedule the bootstrap node onto"
}

variable "additional_network_ids" {
type = list(string)
description = "IDs of additional networks for the bootstrap node."
}
1 change: 1 addition & 0 deletions data/data/openstack/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module "bootstrap" {
root_volume_size = var.openstack_master_root_volume_size
root_volume_type = var.openstack_master_root_volume_type
zone = var.openstack_master_availability_zones[0]
additional_network_ids = var.openstack_additional_network_ids
}

module "masters" {
Expand Down

0 comments on commit 57d4e4d

Please sign in to comment.