Commit 7eb88847 authored by John Jarvis's avatar John Jarvis
Browse files

Jarv/add testbed peering

parent e8985440
......@@ -61,6 +61,12 @@ resource "google_compute_network_peering" "peering_pre" {
peer_network = "${var.network_pre}"
}
resource "google_compute_network_peering" "peering_testbed" {
name = "peering-testbed"
network = "${var.network_ops}"
peer_network = "${var.network_testbed}"
}
##################################
#
# Log Proxy
......
......@@ -173,6 +173,10 @@ variable "lb_fqdns_bastion" {
default = ["lb-bastion.ops.gitlab.com"]
}
variable "network_testbed" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-testbed/global/networks/testbed"
}
variable "network_ops" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-ops/global/networks/ops"
}
......
......@@ -142,14 +142,14 @@ variable "subnetworks" {
"gke-pre" = "10.232.20.0/24"
"web-puma" = "10.232.21.0/24"
"gke-pre-pod-cidr" = "10.235.0.0/16"
"gke-pre-service-cidr" = "10.236.0.0/16"
# /mnt/storage
"filestore-storage" = "10.237.0.0/29"
"gke-runner-pod-cidr" = "10.238.0.0/16"
"gke-runner-service-cidr" = "10.239.0.0/16"
"gke-pre-pod-cidr" = "10.240.0.0/16"
"gke-pre-service-cidr" = "10.241.0.0/16"
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment