Commit c7820738 authored by Craig Furman's avatar Craig Furman

Merge branch 'craigf/single-disk-gitaly-zfs-gstg' into 'master'

Provision file-zfs test node in gstg

See merge request !868
parents f4c61243 f0af63c2
......@@ -806,14 +806,15 @@ module "file-zfs" {
bootstrap_version = 9
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-stor-gitaly-zfs]\""
data_disk_count = 9
data_disk_size = "${var.data_disk_sizes["file"] / 8}"
data_disk_name = "data"
data_disk_size = "${var.data_disk_sizes["file"]}"
data_disk_type = "pd-ssd"
deletion_protection = true
dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["stor-zfs"]}"
local_ssd_count = 2
log_disk_size = 10
machine_type = "${var.machine_types["stor"]}"
name = "file-zfs"
......@@ -823,7 +824,7 @@ module "file-zfs" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=craigf/configurable-disk-count" # TODO change ref to a release after the TF module MR is merged and tagged
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.2.0"
tier = "stor"
use_new_node_name = true
vpc = "gstg"
......
......@@ -413,8 +413,7 @@ variable "node_count" {
"sidekiq-realtime" = 2
"sidekiq-traces" = 0
"stor" = 2
"stor-zfs" = 0
"stor-zfs-single-zone" = 1
"stor-zfs" = 1
"thanos-compact" = 1
"thanos-store" = 1
"multizone-stor" = 0
......@@ -467,7 +466,6 @@ variable "subnetworks" {
"sidekiq" = "10.225.1.0/24"
"stor" = "10.224.2.0/23"
"stor-zfs" = "10.224.36.0/24"
"stor-zfs-single-zone" = "10.224.37.0/24"
"thanos-compact" = "10.226.5.0/24"
"thanos-store" = "10.226.4.0/24"
"web" = "10.224.1.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