Commit b186da44 authored by John Jarvis's avatar John Jarvis

Jarv/remove cny gstg

parent b269b5bd
...@@ -57,7 +57,7 @@ variable "monitoring_hosts" { ...@@ -57,7 +57,7 @@ variable "monitoring_hosts" {
variable "lb_fqdns" { variable "lb_fqdns" {
type = "list" type = "list"
default = [] default = ["canary.gitlab.com"]
} }
########## ##########
...@@ -73,7 +73,7 @@ variable "lb_fqdns_registry" { ...@@ -73,7 +73,7 @@ variable "lb_fqdns_registry" {
variable "lb_fqdns_cny" { variable "lb_fqdns_cny" {
type = "list" type = "list"
default = ["canary.gitlab.com"] default = []
} }
variable "lb_fqdns_pages" { variable "lb_fqdns_pages" {
...@@ -166,9 +166,9 @@ variable "tcp_lbs_cny" { ...@@ -166,9 +166,9 @@ variable "tcp_lbs_cny" {
type = "map" type = "map"
default = { default = {
"names" = ["http", "https", "ssh"] "names" = []
"forwarding_port_ranges" = ["80", "443", "22"] "forwarding_port_ranges" = []
"health_check_ports" = ["8001", "8002", "8003"] "health_check_ports" = []
} }
} }
...@@ -385,7 +385,7 @@ variable "node_count" { ...@@ -385,7 +385,7 @@ variable "node_count" {
"fe-lb-altssh" = 2 "fe-lb-altssh" = 2
"fe-lb-pages" = 2 "fe-lb-pages" = 2
"fe-lb-registry" = 2 "fe-lb-registry" = 2
"fe-lb-cny" = 2 "fe-lb-cny" = 0
"git" = 25 "git" = 25
"mailroom" = 2 "mailroom" = 2
"patroni" = 6 "patroni" = 6
......
...@@ -91,7 +91,7 @@ variable "monitoring_hosts" { ...@@ -91,7 +91,7 @@ variable "monitoring_hosts" {
variable "lb_fqdns" { variable "lb_fqdns" {
type = "list" type = "list"
default = [] default = ["canary.staging.gitlab.com"]
} }
##### #####
...@@ -108,7 +108,7 @@ variable "lb_fqdns_registry" { ...@@ -108,7 +108,7 @@ variable "lb_fqdns_registry" {
variable "lb_fqdns_cny" { variable "lb_fqdns_cny" {
type = "list" type = "list"
default = ["canary.staging.gitlab.com"] default = []
} }
variable "lb_fqdns_pages" { variable "lb_fqdns_pages" {
...@@ -201,9 +201,9 @@ variable "tcp_lbs_cny" { ...@@ -201,9 +201,9 @@ variable "tcp_lbs_cny" {
type = "map" type = "map"
default = { default = {
"names" = ["http", "https", "ssh"] "names" = []
"forwarding_port_ranges" = ["80", "443", "22"] "forwarding_port_ranges" = []
"health_check_ports" = ["8001", "8002", "8003"] "health_check_ports" = []
} }
} }
...@@ -380,7 +380,7 @@ variable "node_count" { ...@@ -380,7 +380,7 @@ variable "node_count" {
"fe-lb-pages" = 2 "fe-lb-pages" = 2
"fe-lb-altssh" = 2 "fe-lb-altssh" = 2
"fe-lb-registry" = 2 "fe-lb-registry" = 2
"fe-lb-cny" = 2 "fe-lb-cny" = 0
"git" = 3 "git" = 3
"mailroom" = 1 "mailroom" = 1
"pages" = 1 "pages" = 1
......
...@@ -1060,7 +1060,7 @@ module "gcp-tcp-lb-cny" { ...@@ -1060,7 +1060,7 @@ module "gcp-tcp-lb-cny" {
names = "${var.tcp_lbs_cny["names"]}" names = "${var.tcp_lbs_cny["names"]}"
project = "${var.project}" project = "${var.project}"
region = "${var.region}" region = "${var.region}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=remove-lifecycle"
targets = ["fe-cny"] targets = ["fe-cny"]
} }
......
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