Skip to content

Commit

Permalink
Rebase and more code
Browse files Browse the repository at this point in the history
  • Loading branch information
Luca Prete committed Feb 8, 2023
1 parent 2943884 commit 3656cfe
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 24 deletions.
74 changes: 62 additions & 12 deletions fast/stages/2-networking-c-nva/ncc.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,38 @@

locals {
ncc_cr_intf_untrusted_configs = {
ew10 = { host_number = 201, region = "europe-west1", redundant = "ew11" }
ew10 = { host_number = 201, region = "europe-west1" }
ew11 = { host_number = 202, region = "europe-west1", redundant = "ew10" }
ew41 = { host_number = 201, region = "europe-west4", redundant = "ew41" }
ew42 = { host_number = 202, region = "europe-west4", redundant = "ew40" }
ew40 = { host_number = 201, region = "europe-west4" }
ew41 = { host_number = 202, region = "europe-west4", redundant = "ew40" }
}

ncc_cr_base_intf_untrusted_configs = ({
for intf, intf_config in local.ncc_cr_intf_untrusted_configs :
intf => intf_config if try(intf_config.redundant, null) == null
})

ncc_cr_red_intf_untrusted_configs = ({
for intf, intf_config in local.ncc_cr_intf_untrusted_configs :
intf => intf_config if try(intf_config.redundant, null) != null
})

ncc_cr_intf_trusted_configs = {
ew10 = { host_number = 201, region = "europe-west1", redundant = "ew11" }
ew10 = { host_number = 201, region = "europe-west1" }
ew11 = { host_number = 202, region = "europe-west1", redundant = "ew10" }
ew41 = { host_number = 201, region = "europe-west4", redundant = "ew41" }
ew42 = { host_number = 202, region = "europe-west4", redundant = "ew40" }
ew40 = { host_number = 201, region = "europe-west4" }
ew41 = { host_number = 202, region = "europe-west4", redundant = "ew40" }
}

ncc_cr_base_intf_trusted_configs = ({
for intf, intf_config in local.ncc_cr_intf_trusted_configs :
intf => intf_config if try(intf_config.redundant, null) == null
})

ncc_cr_red_intf_trusted_configs = ({
for intf, intf_config in local.ncc_cr_intf_trusted_configs :
intf => intf_config if try(intf_config.redundant, null) != null
})
}

resource "google_network_connectivity_hub" "hub" {
Expand Down Expand Up @@ -87,6 +107,7 @@ resource "google_network_connectivity_spoke" "spoke_trusted" {
resource "google_compute_router" "routers_untrusted" {
for_each = var.region_trigram
name = "prod-untrusted-${each.value}"
project = module.landing-project.project_id
region = each.key
network = module.landing-untrusted-vpc.self_link
bgp {
Expand All @@ -97,6 +118,7 @@ resource "google_compute_router" "routers_untrusted" {
resource "google_compute_router" "routers_trusted" {
for_each = var.region_trigram
name = "prod-trusted-${each.value}"
project = module.landing-project.project_id
region = each.key
network = module.landing-trusted-vpc.self_link
bgp {
Expand All @@ -107,6 +129,7 @@ resource "google_compute_router" "routers_trusted" {
resource "google_compute_address" "router_intf_addrs_untrusted" {
for_each = local.ncc_cr_intf_untrusted_configs
name = "prod-untrusted-${each.key}"
project = module.landing-project.project_id
region = each.value.region
subnetwork = module.landing-untrusted-vpc.subnet_self_links["${each.value.region}/landing-untrusted-default-${var.region_trigram[each.value.region]}"]
address = cidrhost(module.landing-untrusted-vpc.subnet_ips["${each.value.region}/landing-untrusted-default-${var.region_trigram[each.value.region]}"], each.value.host_number)
Expand All @@ -116,30 +139,53 @@ resource "google_compute_address" "router_intf_addrs_untrusted" {
resource "google_compute_address" "router_intf_addrs_trusted" {
for_each = local.ncc_cr_intf_trusted_configs
name = "prod-trusted-${each.key}"
project = module.landing-project.project_id
region = each.value.region
subnetwork = module.landing-trusted-vpc.subnet_self_links["${each.value.region}/landing-trusted-default-${var.region_trigram[each.value.region]}"]
address = cidrhost(module.landing-trusted-vpc.subnet_ips["${each.value.region}/landing-trusted-default-${var.region_trigram[each.value.region]}"], each.value.host_number)
address_type = "INTERNAL"
}

resource "google_compute_router_interface" "router_intfs_untrusted" {
for_each = local.ncc_cr_intf_untrusted_configs
for_each = local.ncc_cr_base_intf_untrusted_configs
name = "prod-untrusted-${each.key}"
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_untrusted[each.value.region].name
subnetwork = module.landing-untrusted-vpc.subnet_self_links["${each.value.region}/landing-untrusted-default-${var.region_trigram[each.value.region]}"]
private_ip_address = google_compute_address.router_intf_addrs_untrusted[each.key].address
}

resource "google_compute_router_interface" "router_red_intfs_untrusted" {
for_each = local.ncc_cr_red_intf_untrusted_configs
name = "prod-untrusted-${each.key}"
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_untrusted[each.value.region].name
subnetwork = module.landing-untrusted-vpc.subnet_self_links["${each.value.region}/landing-untrusted-default-${var.region_trigram[each.value.region]}"]
private_ip_address = google_compute_address.router_intf_addrs_trusted[each.key].address
redundant_interface = each.value.redundant
private_ip_address = google_compute_address.router_intf_addrs_untrusted[each.key].address
redundant_interface = google_compute_router_interface.router_intfs_untrusted[each.value.redundant].name
}

resource "google_compute_router_interface" "router_intfs_trusted" {
for_each = local.ncc_cr_intf_trusted_configs
for_each = local.ncc_cr_base_intf_trusted_configs
name = "prod-trusted-${each.key}"
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_trusted[each.value.region].name
subnetwork = module.landing-trusted-vpc.subnet_self_links["${each.value.region}/landing-trusted-default-${var.region_trigram[each.value.region]}"]
private_ip_address = google_compute_address.router_intf_addrs_trusted[each.key].address
}

resource "google_compute_router_interface" "router_red_intfs_trusted" {
for_each = local.ncc_cr_red_intf_trusted_configs
name = "prod-trusted-${each.key}"
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_trusted[each.value.region].name
subnetwork = module.landing-trusted-vpc.subnet_self_links["${each.value.region}/landing-trusted-default-${var.region_trigram[each.value.region]}"]
private_ip_address = google_compute_address.router_intf_addrs_untrusted[each.key].address
redundant_interface = each.value.redundant
private_ip_address = google_compute_address.router_intf_addrs_trusted[each.key].address
redundant_interface = google_compute_router_interface.router_intfs_trusted[each.value.redundant].name
}

resource "google_compute_router_peer" "peers_untrusted_to_nvas_zone_b" {
Expand All @@ -148,6 +194,7 @@ resource "google_compute_router_peer" "peers_untrusted_to_nvas_zone_b" {
name = "prod-untrusted-${each.key}-b"
peer_asn = 65513
peer_ip_address = local.nva_configs["${each.value.region}-b"].ip_untrusted
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_untrusted[each.value.region].name
router_appliance_instance = module.nva["${each.value.region}-b"].self_link
Expand All @@ -159,6 +206,7 @@ resource "google_compute_router_peer" "peers_untrusted_to_nvas_zone_c" {
name = "prod-untrusted-${each.key}-c"
peer_asn = 65513
peer_ip_address = local.nva_configs["${each.value.region}-c"].ip_untrusted
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_untrusted[each.value.region].name
router_appliance_instance = module.nva["${each.value.region}-c"].self_link
Expand All @@ -170,6 +218,7 @@ resource "google_compute_router_peer" "peers_trusted_to_nvas_zone_b" {
name = "prod-trusted-${each.key}-b"
peer_asn = 65514
peer_ip_address = local.nva_configs["${each.value.region}-b"].ip_trusted
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_trusted[each.value.region].name
router_appliance_instance = module.nva["${each.value.region}-b"].self_link
Expand All @@ -181,6 +230,7 @@ resource "google_compute_router_peer" "peers_trusted_to_nvas_zone_c" {
name = "prod-trusted-${each.key}-c"
peer_asn = 65514
peer_ip_address = local.nva_configs["${each.value.region}-c"].ip_trusted
project = module.landing-project.project_id
region = each.value.region
router = google_compute_router.routers_trusted[each.value.region].name
router_appliance_instance = module.nva["${each.value.region}-c"].self_link
Expand Down
14 changes: 5 additions & 9 deletions fast/stages/2-networking-c-nva/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,33 +194,29 @@ variable "region_trigram" {
}

variable "router_configs" {
description = "Configurations for CRs and onprem routers."
description = "Configurations for cloud routers."
type = map(object({
adv = object({
adv = optional(object({
custom = list(string)
default = bool
})
}))
asn = number
}))
default = {
landing-trusted-ew1 = {
landing-trusted-vpn-to-onprem-ew1 = {
asn = "64512"
adv = null
# adv = { default = false, custom = [] }
}
landing-trusted-ew4 = {
landing-trusted-vpn-to-onprem-ew4 = {
asn = "64512"
adv = null
# adv = { default = false, custom = [] }
}
landing-trusted-ncc = {
asn = "64515"
adv = null
# adv = { default = false, custom = [] }
}
landing-untrusted-ncc = {
asn = "64515"
adv = null
# adv = { default = false, custom = [] }
}
}
Expand Down
6 changes: 3 additions & 3 deletions fast/stages/2-networking-c-nva/vpn-onprem.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module "landing-to-onprem-ew1-vpn" {
name = "vpn-to-onprem-ew1"
router_config = {
name = "landing-onprem-vpn-ew1"
asn = var.router_configs.landing-trusted-ew1.asn
asn = var.router_configs.landing-trusted-vpn-to-onprem-ew1.asn
}
peer_gateway = {
external = var.vpn_onprem_configs.landing-trusted-ew1.peer_external_gateway
Expand Down Expand Up @@ -71,10 +71,10 @@ module "landing-to-onprem-ew4-vpn" {
name = "vpn-to-onprem-ew4"
router_config = {
name = "landing-onprem-vpn-ew4"
asn = var.router_configs.landing-trusted-ew4.asn
asn = var.router_configs.landing-trusted-vpn-to-onprem-ew4.asn
}
peer_gateway = {
external = var.vpn_onprem_configs.landing-trusted-ew4.peer_external_gateway
external = var.vpn_onprem_configs.landing-trusted-vpn-to-onprem-ew.peer_external_gateway
}
tunnels = {
for t in var.vpn_onprem_configs.landing-trusted-ew4.tunnels :
Expand Down

0 comments on commit 3656cfe

Please sign in to comment.