Commit 99d08aaa authored by Jose Finotto's avatar Jose Finotto
Browse files

changing os version for 1 box in the benchmark environment

parent 2cc40242
......@@ -13,11 +13,6 @@ provider "aws" {
version = "~> 2.27.0"
}
## Local
provider "local" {
version = "~> 1.4.0"
}
## Google
provider "google" {
......@@ -160,8 +155,8 @@ module "consul" {
module "patroni" {
assign_public_ip = false
bootstrap_data_disk = false
bootstrap_version = 9
bootstrap_data_disk = true
bootstrap_version = var.bootstrap_script_version
chef_provision = var.chef_provision
chef_run_list = "\"role[${var.environment}-base-db-patroni]\""
create_backend_service = true
......@@ -182,11 +177,12 @@ module "patroni" {
service_account_email = var.service_account_email
service_path = "/"
service_port = 6432
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v4.1.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v4.1.4"
tier = "db"
use_new_node_name = true
vpc = module.network.self_link
os_disk_size = 100
data_disk_snapshot = "projects/gitlab-production/global/snapshots/jlebh8puv0al"
}
module "patroni-zfs" {
......@@ -288,6 +284,8 @@ module "patroni-zfs-registry" {
#
#############################################
# == Cluster #1 ==
module "pgbouncer" {
assign_public_ip = false
bootstrap_version = var.bootstrap_script_version
......@@ -312,6 +310,7 @@ module "pgbouncer" {
tier = "db"
use_new_node_name = true
vpc = module.network.self_link
os_boot_image = var.os_boot_image["patroni"]
}
module "pgbouncer-sidekiq" {
......@@ -338,6 +337,7 @@ module "pgbouncer-sidekiq" {
tier = "db"
use_new_node_name = true
vpc = module.network.self_link
os_boot_image = var.os_boot_image["patroni"]
}
module "pgbouncer-registry" {
......@@ -366,6 +366,8 @@ module "pgbouncer-registry" {
vpc = module.network.self_link
}
# == Cluster #2 ==
module "ci-pgbouncer" {
assign_public_ip = false
bootstrap_version = var.bootstrap_script_version
......@@ -390,6 +392,7 @@ module "ci-pgbouncer" {
tier = "db"
use_new_node_name = true
vpc = module.network.self_link
os_boot_image = var.os_boot_image["patroni"]
}
module "ci-pgbouncer-sidekiq" {
......@@ -416,6 +419,7 @@ module "ci-pgbouncer-sidekiq" {
tier = "db"
use_new_node_name = true
vpc = module.network.self_link
os_boot_image = var.os_boot_image["patroni"]
}
#############################################
......
......@@ -6,63 +6,67 @@
#
#############################################
//module "pg12ute-patroni-source" {
// assign_public_ip = false
// bootstrap_version = var.bootstrap_script_version
// chef_provision = var.chef_provision
// chef_run_list = "\"role[${var.environment}-base-db-pg12ute-patroni-source]\""
// create_backend_service = true
// data_disk_size = var.data_disk_sizes["pg12ute-patroni-source"]
// data_disk_type = "pd-ssd"
// dns_zone_name = var.dns_zone_name
// environment = var.environment
// health_check = "http"
// health_check_port = "8009"
// log_disk_size = "250"
// ip_cidr_range = var.subnetworks["pg12ute-patroni-source"]
// machine_type = var.machine_types["patroni"]
// name = "pg12ute-patroni-source"
// node_count = var.node_count["pg12ute-patroni-source"]
// project = var.project
// public_ports = var.public_ports["patroni"]
// region = var.region
// service_account_email = var.service_account_email
// service_path = "/"
// service_port = 6432
// source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v4.1.3"
// tier = "db"
// use_new_node_name = true
// vpc = module.network.self_link
// os_disk_size = 100
//}
//
//
//module "pg12ute-patroni-target" {
// assign_public_ip = false
// bootstrap_version = var.bootstrap_script_version
// chef_provision = var.chef_provision
// chef_run_list = "\"role[${var.environment}-base-db-pg12ute-patroni-target]\""
// create_backend_service = true
// data_disk_size = var.data_disk_sizes["pg12ute-patroni-target"]
// data_disk_type = "pd-ssd"
// dns_zone_name = var.dns_zone_name
// environment = var.environment
// health_check = "http"
// health_check_port = "8009"
// log_disk_size = "250"
// ip_cidr_range = var.subnetworks["pg12ute-patroni-target"]
// machine_type = var.machine_types["pg12ute-patroni-target"]
// name = "pg12ute-patroni-target"
// node_count = var.node_count["pg12ute-patroni-target"]
// project = var.project
// public_ports = var.public_ports["patroni"]
// region = var.region
// service_account_email = var.service_account_email
// service_path = "/"
// service_port = 6432
// source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v4.1.3"
// tier = "db"
// use_new_node_name = true
// vpc = module.network.self_link
// os_disk_size = 100
//}
module "pg12ute-patroni-source" {
assign_public_ip = false
bootstrap_version = var.bootstrap_script_version
bootstrap_data_disk = true
chef_provision = var.chef_provision
chef_run_list = "\"role[${var.environment}-base-db-pg12ute-patroni-source]\""
create_backend_service = true
data_disk_size = var.data_disk_sizes["pg12ute-patroni-source"]
data_disk_type = "pd-ssd"
dns_zone_name = var.dns_zone_name
environment = var.environment
health_check = "http"
health_check_port = "8009"
log_disk_size = "250"
ip_cidr_range = var.subnetworks["pg12ute-patroni-source"]
machine_type = var.machine_types["patroni"]
name = "pg12ute-patroni-source"
node_count = var.node_count["pg12ute-patroni-source"]
project = var.project
public_ports = var.public_ports["patroni"]
region = var.region
service_account_email = var.service_account_email
service_path = "/"
service_port = 6432
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v4.1.4"
tier = "db"
use_new_node_name = true
vpc = module.network.self_link
os_disk_size = 100
data_disk_snapshot = "projects/gitlab-production/global/snapshots/jlebh8puv0al"
}
module "pg12ute-patroni-target" {
assign_public_ip = false
bootstrap_version = var.bootstrap_script_version
bootstrap_data_disk = true
chef_provision = var.chef_provision
chef_run_list = "\"role[${var.environment}-base-db-pg12ute-patroni-target]\""
create_backend_service = true
data_disk_size = var.data_disk_sizes["pg12ute-patroni-target"]
data_disk_type = "pd-ssd"
dns_zone_name = var.dns_zone_name
environment = var.environment
health_check = "http"
health_check_port = "8009"
log_disk_size = "250"
ip_cidr_range = var.subnetworks["pg12ute-patroni-target"]
machine_type = var.machine_types["pg12ute-patroni-target"]
name = "pg12ute-patroni-target"
node_count = var.node_count["pg12ute-patroni-target"]
project = var.project
public_ports = var.public_ports["patroni"]
region = var.region
service_account_email = var.service_account_email
service_path = "/"
service_port = 6432
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v4.1.4"
tier = "db"
use_new_node_name = true
vpc = module.network.self_link
os_disk_size = 100
data_disk_snapshot = "projects/gitlab-production/global/snapshots/jlebh8puv0al"
}
......@@ -28,7 +28,7 @@ variable "cloudflare_zone_name" {}
variable "cloudflare_zone_id" {}
variable "bootstrap_script_version" {
default = 8
default = 10
}
variable "chef_provision" {
......@@ -131,8 +131,8 @@ variable "data_disk_sizes" {
default = {
"patroni" = "28000"
"patroni-registry" = "1000"
"pg12ute-patroni-source" = "16000"
"pg12ute-patroni-target" = "16000"
"pg12ute-patroni-source" = "28000"
"pg12ute-patroni-target" = "28000"
"prometheus" = "4000"
}
}
......@@ -203,6 +203,14 @@ variable "monitoring_hosts" {
}
}
variable "os_boot_image" {
type = map(string)
default = {
"patroni" = "gitlab-production/gitlab-ubuntu-1604"
}
}
#################
# Monitoring whitelist
#################
......
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