Commit ae218dcc authored by John Jarvis's avatar John Jarvis Committed by Ahmad Sherif

Jarv/updates gprd gstg

parent 204d24d8
......@@ -5,30 +5,13 @@
resource "google_compute_url_map" "monitoring-lb" {
name = "${format("%v-monitoring-lb", var.environment)}"
default_service = "${module.performance.google_compute_backend_service_self_link}"
###################################
host_rule {
hosts = ["performance.gprd.gitlab.net"]
path_matcher = "performance"
}
path_matcher {
name = "performance"
default_service = "${module.performance.google_compute_backend_service_self_link}"
path_rule {
paths = ["/*"]
service = "${module.performance.google_compute_backend_service_self_link}"
}
}
###################################
default_service = "${module.prometheus.google_compute_backend_service_self_link}"
host_rule {
hosts = ["prometheus.gprd.gitlab.net"]
path_matcher = "prometheus"
}
path_matcher {
name = "prometheus"
default_service = "${module.prometheus.google_compute_backend_service_self_link}"
......
......@@ -183,23 +183,24 @@ module "registry" {
#################################
module "postgres" {
bootstrap_version = 5
data_disk_size = 5000
data_disk_type = "pd-ssd"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-postgres]\",\"role[${var.environment}-base-db-postgres-replication]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["db"]}"
machine_type = "${var.machine_types["db"]}"
name = "postgres"
node_count = "${var.node_count["db"]}"
project = "${var.project}"
public_ports = "${var.public_ports["db"]}"
region = "${var.region}"
source = "../../modules/google/generic-stor"
tier = "db"
vpc = "${module.network.self_link}"
bootstrap_version = 5
data_disk_size = 5000
data_disk_type = "pd-ssd"
chef_init_run_list = "\"recipe[gitlab-server::hack_gitlab_ctl_reconfigure]\""
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-postgres]\",\"role[${var.environment}-base-db-postgres-replication]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["db"]}"
machine_type = "${var.machine_types["db"]}"
name = "postgres"
node_count = "${var.node_count["db"]}"
project = "${var.project}"
public_ports = "${var.public_ports["db"]}"
region = "${var.region}"
source = "../../modules/google/generic-stor"
tier = "db"
vpc = "${module.network.self_link}"
service_account_email = "${var.service_account_email}"
}
......@@ -233,23 +234,24 @@ module "gcp-tcp-lb-internal-pgbouncer" {
}
module "pg-bouncer" {
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-pgbouncer]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["pgb"]}"
machine_type = "${var.machine_types["pgb"]}"
name = "pgbouncer"
node_count = "${var.node_count["pgb"]}"
project = "${var.project}"
public_ports = "${var.public_ports["pgb"]}"
region = "${var.region}"
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_init_run_list = "\"recipe[gitlab-server::hack_gitlab_ctl_reconfigure]\""
chef_run_list = "\"role[${var.environment}-base-db-pgbouncer]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["pgb"]}"
machine_type = "${var.machine_types["pgb"]}"
name = "pgbouncer"
node_count = "${var.node_count["pgb"]}"
project = "${var.project}"
public_ports = "${var.public_ports["pgb"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "../../modules/google/generic-sv-with-group"
health_check = "tcp"
service_port = 22
service_port = 6432
tier = "db"
vpc = "${module.network.self_link}"
use_new_node_name = true
......@@ -262,23 +264,24 @@ module "pg-bouncer" {
#############################################
module "geo-postgres" {
bootstrap_version = 5
data_disk_size = 5000
data_disk_type = "pd-ssd"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-geo-postgres]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["geodb"]}"
machine_type = "${var.machine_types["geodb"]}"
name = "geo-postgres"
node_count = "${var.node_count["geodb"]}"
project = "${var.project}"
public_ports = "${var.public_ports["geodb"]}"
region = "${var.region}"
source = "../../modules/google/generic-stor"
tier = "db"
vpc = "${module.network.self_link}"
bootstrap_version = 5
data_disk_size = 5000
data_disk_type = "pd-ssd"
chef_provision = "${var.chef_provision}"
chef_init_run_list = "\"recipe[gitlab-server::hack_gitlab_ctl_reconfigure]\""
chef_run_list = "\"role[${var.environment}-base-db-geo-postgres]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["geodb"]}"
machine_type = "${var.machine_types["geodb"]}"
name = "geo-postgres"
node_count = "${var.node_count["geodb"]}"
project = "${var.project}"
public_ports = "${var.public_ports["geodb"]}"
region = "${var.region}"
source = "../../modules/google/generic-stor"
tier = "db"
vpc = "${module.network.self_link}"
service_account_email = "${var.service_account_email}"
}
......@@ -385,7 +388,7 @@ module "sidekiq" {
##################################
module "mailroom" {
bootstrap_version = 5
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-be-mailroom]\""
dns_zone_name = "${var.dns_zone_name}"
......@@ -404,6 +407,8 @@ module "mailroom" {
vpc = "${module.network.self_link}"
service_account_email = "${var.service_account_email}"
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
}
##################################
......@@ -413,7 +418,9 @@ module "mailroom" {
##################################
module "file" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
data_disk_size = 16000
data_disk_type = "pd-ssd"
chef_provision = "${var.chef_provision}"
......@@ -458,7 +465,9 @@ module "file" {
##################################
module "share" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
data_disk_size = 16000
data_disk_type = "pd-standard"
chef_provision = "${var.chef_provision}"
......@@ -480,7 +489,9 @@ module "share" {
}
module "lfs" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
data_disk_size = 16000
data_disk_type = "pd-standard"
chef_run_list = "\"role[${var.environment}-base-stor]\""
......@@ -503,7 +514,9 @@ module "lfs" {
}
module "pages" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
chef_run_list = "\"role[${var.environment}-base-stor]\""
data_disk_size = 16000
data_disk_type = "pd-standard"
......@@ -526,7 +539,9 @@ module "pages" {
}
module "artifacts" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
chef_run_list = "\"role[${var.environment}-base-stor]\""
data_disk_size = 32000
data_disk_type = "pd-standard"
......@@ -555,7 +570,9 @@ module "artifacts" {
##################################
module "fe-lb" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-lb-fe]\""
dns_zone_name = "${var.dns_zone_name}"
......@@ -584,7 +601,9 @@ module "fe-lb" {
##################################
module "fe-lb-pages" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-lb-pages]\""
dns_zone_name = "${var.dns_zone_name}"
......@@ -611,7 +630,9 @@ module "fe-lb-pages" {
##################################
module "fe-lb-altssh" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-lb-altssh]\""
dns_zone_name = "${var.dns_zone_name}"
......@@ -757,7 +778,9 @@ module "gcp-tcp-lb-bastion" {
##################################
module "consul" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[gprd-infra-consul]\""
dns_zone_name = "${var.dns_zone_name}"
......@@ -792,7 +815,9 @@ module "consul" {
##################################
module "pubsubbeat" {
bootstrap_version = 5
bootstrap_version = 6
use_new_node_name = true
kernel_version = "${var.default_kernel_version}"
allow_stopping_for_update = true
names = "${var.pubsubbeats["names"]}"
machine_types = "${var.pubsubbeats["machine_types"]}"
......
......@@ -293,9 +293,9 @@ variable "node_count" {
"sidekiq-traces" = 2
"stor" = 20
"web" = 14
"alerts" = 3
"prometheus" = 3
"prometheus-app" = 3
"alerts" = 2
"prometheus" = 2
"prometheus-app" = 2
}
}
......
......@@ -177,7 +177,7 @@ module "postgres" {
bootstrap_version = 6
data_disk_size = 5000
data_disk_type = "pd-ssd"
chef_init_run_list = "\"role[${var.environment}-force-gitlab-ctl-reconfigure]\""
chef_init_run_list = "\"recipe[gitlab-server::hack_gitlab_ctl_reconfigure]\""
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-postgres]\""
dns_zone_name = "${var.dns_zone_name}"
......@@ -227,7 +227,7 @@ module "gcp-tcp-lb-internal-pgbouncer" {
module "pg-bouncer" {
bootstrap_version = 6
chef_init_run_list = "\"role[${var.environment}-force-gitlab-ctl-reconfigure]\""
chef_init_run_list = "\"recipe[gitlab-server::hack_gitlab_ctl_reconfigure]\""
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-pgbouncer]\""
dns_zone_name = "${var.dns_zone_name}"
......@@ -255,7 +255,7 @@ module "geo-postgres" {
bootstrap_version = 6
data_disk_size = 5000
data_disk_type = "pd-ssd"
chef_init_run_list = "\"role[${var.environment}-force-gitlab-ctl-reconfigure]\""
chef_init_run_list = "\"recipe[gitlab-server::hack_gitlab_ctl_reconfigure]\""
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-geo-postgres]\""
dns_zone_name = "${var.dns_zone_name}"
......
......@@ -291,9 +291,9 @@ variable "node_count" {
"sidekiq-traces" = 1
"stor" = 2
"web" = 1
"prometheus" = 3
"prometheus-app" = 3
"alerts" = 3
"prometheus" = 2
"prometheus-app" = 2
"alerts" = 2
}
}
......
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