Geo gitaly nodes gstg

parent 6222aa2f
......@@ -1383,6 +1383,44 @@ module "geo-secondary" {
os_disk_size = 100
}
module "geo-file" {
# Primary git storage uses zone-overweighting in us-east1-c for historical
# reasons, as a zonal quota was unavailable at provisioning time. This module
# ensures there are an equal number of geo and primary git stores, without
# having the same lopsided zone distribution.
#
# This is what we will want to do for production node_count, but in staging
# most of the nodes are almost empty, and are really experimental artifacts
# for unfinished features like ZFS storage and praefect. For this reason we
# will use only 1 physical shard, and store all logical shards on it.
#
# node_count = var.node_count["stor"] + var.node_count["multizone-stor"]
node_count = 1
assign_public_ip = false
bootstrap_version = var.bootstrap_script_version
chef_provision = var.chef_provision
chef_run_list = "\"role[${var.environment}-base-stor-gitaly]\""
deletion_protection = true
data_disk_size = var.data_disk_sizes["file"]
data_disk_type = "pd-ssd"
dns_zone_name = var.dns_zone_name
egress_ports = var.gitaly_egress_ports
environment = var.environment
ip_cidr_range = var.subnetworks["geo-stor"]
machine_type = var.machine_types["stor"]
name = "geo-file"
os_disk_type = "pd-ssd"
project = var.project
public_ports = var.public_ports["stor"]
region = var.region
service_account_email = var.service_account_email
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v3.1.0"
tier = "stor"
use_new_node_name = true
vpc = module.network.self_link
}
##################################
#
# Pubsubbeats
......
......@@ -466,6 +466,7 @@ variable "subnetworks" {
"git" = "10.224.13.0/24"
"geo-dr" = "10.224.38.0/24"
"geo-secondary" = "10.224.39.0/24"
"geo-stor" = "10.224.40.0/23"
"influxdb" = "10.226.3.0/24"
"monitoring" = "10.226.1.0/24"
"patroni" = "10.224.29.0/24"
......
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