Adds Iowa, Tokyo, and São Paulo regions (all GCP)

This commit is contained in:
Nemo 2020-08-05 18:49:26 +05:30
parent c2ca065931
commit ed55f11777
2 changed files with 82 additions and 12 deletions

View File

@ -15,6 +15,12 @@ locals {
"35.236.208.158"
]
# Iowa
gcp-us-central1 = [
"34.70.246.244",
"34.72.125.23"
]
# Oregon
gcp-us-west1 = [
"35.185.199.172",
@ -24,6 +30,12 @@ locals {
"34.83.151.46",
]
# Canada / Montreal
gcp-northamerica-northeast1 = [
"35.203.16.100",
"35.203.92.116",
]
# London
gcp-europe-west2 = [
"35.246.117.58",
@ -33,7 +45,15 @@ locals {
# Frankfurt
gcp-europe-west3 = [
"34.89.161.120",
"34.89.225.213"
"34.89.225.213",
"35.204.222.110",
"34.91.136.228"
]
# Tokyo, Japan
gcp-asia-northeast1 = [
"34.84.255.194",
"35.243.85.184"
]
# Singapore
@ -41,15 +61,16 @@ locals {
"35.185.184.54"
]
# Canada / Montreal
gcp-northamerica-northeast1 = [
"35.203.16.100",
"35.203.92.116",
]
# Sydney
gcp-australia-southeast1 = [
"35.189.54.47"
"35.189.54.47",
"35.189.25.55"
]
# São Paulo, Brazil
gcp-southamerica-east1 = [
"35.199.102.40",
"35.199.99.1"
]
us = [

View File

@ -110,6 +110,12 @@ output "gcp_us_east4_ips" {
value = "${local.gcp-us-east4}"
}
// Northern Virginia
output "gcp_us_central1_ips" {
description = "IP addresses for instances hosted on GCP (Iowa / gcp-us-central1)"
value = "${local.gcp-us-central1}"
}
// Oregon
output "gcp_us_west1_ips" {
description = "IP addresses for instances hosted on GCP (Oregon / us-west1)"
@ -134,6 +140,12 @@ output "gcp_europe_west3_ips" {
value = "${local.gcp-europe-west3}"
}
// Tokyo
output "gcp_asia_northeast1_ips" {
description = "IP addresses for instances hosted on GCP (Tokyo / gcp-asia-northeast1)"
value = "${local.gcp-asia-northeast1}"
}
// Singapore
output "gcp_asia_southeast1_ips" {
description = "IP addresses for instances hosted on GCP (Singapore / asia-southeast1)"
@ -146,6 +158,12 @@ output "gcp_australia_southeast1_ips" {
value = "${local.gcp-australia-southeast1}"
}
// São Paulo, Brazil
output "gcp_southamerica_east1_ips" {
description = "IP addresses for instances hosted on GCP (São Paulo / gcp-southamerica-east1)"
value = "${local.gcp-southamerica-east1}"
}
##### GCP CIDRs #####
@ -157,10 +175,17 @@ output "gcp_us_east1_cidr" {
// Northern Virginia
output "gcp_us_east4_cidr" {
description = "CIDRs for instances hosted on GCP (Northern Virginia / us-east4)"
description = "CIDRs for instances hosted on GCP (Iowa / us-east4)"
value = ["${formatlist("%s/32", local.gcp-us-east4)}"]
}
// Iowa
output "gcp_us_central1_cidr" {
description = "CIDRs for instances hosted on GCP (Iowa / us-central1)"
value = ["${formatlist("%s/32", local.gcp-us-central1)}"]
}
// Oregon
output "gcp_us_west1_cidr" {
description = "CIDRs for instances hosted on GCP (Oregon / us-west1)"
@ -186,18 +211,30 @@ output "gcp_europe_west3_cidr" {
value = ["${formatlist("%s/32", local.gcp-europe-west3)}"]
}
// Tokyo
output "gcp_asia_northeast1_cidr" {
description = "CIDRs for instances hosted on GCP (Tokyo / asia-northeast1)"
value = ["${formatlist("%s/32", local.gcp-asia-northeast1)}"]
}
// Singapore
output "gcp_asia_southeast1_cidr" {
description = "CIDRs for instances hosted on GCP (South Carolina / us-east1)"
value = ["${formatlist("%s/32", local.gcp-us-east1)}"]
}
// Singapore
// Sydney
output "gcp_australia_southeast1_cidr" {
description = "CIDRs for instances hosted on GCP (Sydney / australia-southeast1)"
value = ["${formatlist("%s/32", local.gcp-australia-southeast1)}"]
}
// São Paulo, Brazil
output "gcp_southamerica_east1_cidr" {
description = "CIDRs for instances hosted on GCP (São Paulo / southamerica-east1)"
value = ["${formatlist("%s/32", local.gcp-southamerica-east1)}"]
}
##### GCP Common ####
output "gcp_cidr" {
@ -206,12 +243,15 @@ output "gcp_cidr" {
value = "${formatlist("%s/32", concat(
local.gcp-us-east1,
local.gcp-us-east4,
local.gcp-us-central1,
local.gcp-us-west1,
local.gcp-northamerica-northeast1,
local.gcp-europe-west2,
local.gcp-europe-west3,
local.gcp-asia-northeast1,
local.gcp-asia-southeast1,
local.gcp-australia-southeast1
local.gcp-australia-southeast1,
local.gcp-southamerica-east1
))}"
}
@ -221,12 +261,15 @@ output "gcp_ips" {
value = "${concat(
local.gcp-us-east1,
local.gcp-us-east4,
local.gcp-us-central1,
local.gcp-us-west1,
local.gcp-northamerica-northeast1,
local.gcp-europe-west2,
local.gcp-europe-west3,
local.gcp-asia-northeast1,
local.gcp-asia-southeast1,
local.gcp-australia-southeast1
local.gcp-australia-southeast1,
local.gcp-southamerica-east1
)}"
}
@ -320,12 +363,15 @@ output "all_cidr" {
value = "${formatlist("%s/32", concat(
local.gcp-us-east1,
local.gcp-us-east4,
local.gcp-us-central1,
local.gcp-us-west1,
local.gcp-northamerica-northeast1,
local.gcp-europe-west2,
local.gcp-europe-west3,
local.gcp-asia-northeast1,
local.gcp-asia-southeast1,
local.gcp-australia-southeast1,
local.gcp-southamerica-east1,
local.us,
local.ca,
local.as,
@ -349,12 +395,15 @@ output "all_ips" {
value = "${concat(
local.gcp-us-east1,
local.gcp-us-east4,
local.gcp-us-central1,
local.gcp-us-west1,
local.gcp-northamerica-northeast1,
local.gcp-europe-west2,
local.gcp-europe-west3,
local.gcp-asia-northeast1,
local.gcp-asia-southeast1,
local.gcp-australia-southeast1,
local.gcp-southamerica-east1,
local.us,
local.ca,
local.as,