Skip to content

Commit

Permalink
Fix for partner interconnect, the router interface and the BGP peers …
Browse files Browse the repository at this point in the history
…are automatically created
  • Loading branch information
apichick committed Sep 12, 2023
1 parent f225b60 commit 1c1b149
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
6 changes: 3 additions & 3 deletions modules/net-vlan-attachment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ module "example-va" {
name = google_compute_router.interconnect-router.name
}
}
# tftest modules=1 resources=3
# tftest modules=1 resources=2
```

### Dedicated Interconnect - Two VLAN Attachments on a single region (99.9% SLA)
Expand Down Expand Up @@ -201,7 +201,7 @@ module "example-va-b" {
edge_availability_domain = "AVAILABILITY_DOMAIN_2"
}
}
# tftest modules=2 resources=5
# tftest modules=2 resources=3
```

### Dedicated Interconnect - Four VLAN Attachments on two regions (99.99% SLA)
Expand Down Expand Up @@ -431,7 +431,7 @@ module "example-va-b-ew12" {
edge_availability_domain = "AVAILABILITY_DOMAIN_2"
}
}
# tftest modules=4 resources=10
# tftest modules=4 resources=6
```

### IPSec over Interconnect enabled setup
Expand Down
13 changes: 11 additions & 2 deletions modules/net-vlan-attachment/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,15 @@ resource "google_compute_router" "encrypted" {
region = var.region
encrypted_interconnect_router = true
bgp {
asn = var.router_config.asn
asn = var.router_config.asn
advertise_mode = var.dedicated_interconnect_config == null ? "DEFAULT" : "CUSTOM"
dynamic "advertised_ip_ranges" {
for_each = var.dedicated_interconnect_config == null ? var.ipsec_gateway_ip_ranges : {}
content {
description = advertised_ip_ranges.key
range = advertised_ip_ranges.value
}
}
}
}

Expand Down Expand Up @@ -106,13 +114,14 @@ resource "google_compute_router_interface" "default" {
}

resource "google_compute_router_peer" "default" {
count = var.dedicated_interconnect_config != null ? 1 : 0
name = "${var.name}-peer"
project = var.project_id
router = local.router
region = var.region
peer_ip_address = split("/", google_compute_interconnect_attachment.default.customer_router_ip_address)[0]
peer_asn = var.peer_asn
interface = "${var.name}-intf"
interface = google_compute_router_interface.default[0].name
advertised_route_priority = 100
advertise_mode = "CUSTOM"

Expand Down

0 comments on commit 1c1b149

Please sign in to comment.