Commit 3712fbf1 authored by Craig Furman's avatar Craig Furman

Merge branch 'michalw/test-zfs-in-stg' into 'master'

test zfs nodes creation in the staging environment

See merge request !861
parents f293feb6 9226a085
......@@ -777,6 +777,63 @@ module "file" {
zone = "us-east1-c"
}
module "file-zfs" {
bootstrap_data_disk = false
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_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"]}"
log_disk_size = 10
machine_type = "${var.machine_types["stor"]}"
name = "file-zfs"
node_count = "${var.node_count["stor-zfs"]}"
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://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
tier = "stor"
use_new_node_name = true
vpc = "gstg"
}
module "file-zfs-single-zone" {
bootstrap_data_disk = false
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_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-single-zone"]}"
log_disk_size = 10
machine_type = "${var.machine_types["stor"]}"
name = "file-zfs-single-zone"
node_count = "${var.node_count["stor-zfs-single-zone"]}"
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://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
tier = "stor"
use_new_node_name = true
vpc = "gstg"
zone = "us-east1-d"
}
##################################
#
# Storage nodes for
......
......@@ -410,6 +410,8 @@ variable "node_count" {
"sidekiq-realtime" = 1
"sidekiq-traces" = 0
"stor" = 2
"stor-zfs" = 0
"stor-zfs-single-zone" = 1
"thanos-compact" = 1
"thanos-store" = 1
"multizone-stor" = 0
......@@ -460,6 +462,8 @@ variable "subnetworks" {
"runner" = "10.224.16.0/24"
"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