add peering networks for ops to gprd and gstg

parent 025e2587
......@@ -59,6 +59,7 @@ module "nat" {
network = "gprd"
}
*/
##################################
#
# Network
......@@ -71,6 +72,18 @@ module "network" {
environment = "${var.environment}"
}
##################################
#
# Network Peering
#
#################################
resource "google_compute_network_peering" "peering_ops" {
name = "peering_ops"
network = "${var.network_gprd}"
peer_network = "${var.network_ops}"
}
##################################
#
# Web front-end
......
......@@ -87,6 +87,18 @@ variable "tcp_lbs_bastion" {
}
}
##################
# Network Peering
##################
variable "network_ops" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-ops/global/networks/ops"
}
variable "network_gprd" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-production/global/networks/gprd"
}
#######################
# pubsubbeat config
#######################
......@@ -303,6 +315,7 @@ variable "subnetworks" {
}
}
variable "vpn_peer_address" {
type = "string"
default = "40.70.42.69"
......
......@@ -70,6 +70,18 @@ module "network" {
environment = "${var.environment}"
}
##################################
#
# Network Peering
#
#################################
resource "google_compute_network_peering" "peering_ops" {
name = "peering_ops"
network = "${var.network_gstg}"
peer_network = "${var.network_ops}"
}
##################################
#
# Web front-end
......
......@@ -4,6 +4,18 @@ variable "oauth2_client_secret_prometheus" {}
variable "oauth2_client_id_performance" {}
variable "oauth2_client_secret_performance" {}
##################
# Network Peering
##################
variable "network_ops" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-ops/global/networks/ops"
}
variable "network_gstg" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-staging-1/global/networks/gstg"
}
#######################
# pubsubbeat config
#######################
......
......@@ -35,6 +35,25 @@ module "network" {
environment = "${var.environment}"
}
##################################
#
# Network Peering
#
#################################
resource "google_compute_network_peering" "peering_gprd" {
name = "peering-gprd"
network = "${var.network_ops}"
peer_network = "${var.network_gprd}"
}
resource "google_compute_network_peering" "peering_gstg" {
name = "peering-gstg"
network = "${var.network_ops}"
peer_network = "${var.network_gstg}"
}
##################################
#
# Allow internal traffic
......
......@@ -85,6 +85,18 @@ variable "lb_fqdn_bastion" {
default = "lb-bastion.ops.gitlab.com"
}
variable "network_ops" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-ops/global/networks/ops"
}
variable "network_gprd" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-production/global/networks/gprd"
}
variable "network_gstg" {
default = "https://www.googleapis.com/compute/v1/projects/gitlab-staging-1/global/networks/gstg"
}
variable "tcp_lbs_bastion" {
type = "map"
......
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