Merge branch 'craigf/single-disk-gitaly-zfs-gstg' into 'master'
Provision file-zfs test node in gstg See merge request !868
Showing
... | @@ -806,14 +806,15 @@ module "file-zfs" { | ... | @@ -806,14 +806,15 @@ module "file-zfs" { |
bootstrap_version = 9 | bootstrap_version = 9 | ||
chef_provision = "${var.chef_provision}" | chef_provision = "${var.chef_provision}" | ||
chef_run_list = "\"role[${var.environment}-base-stor-gitaly-zfs]\"" | chef_run_list = "\"role[${var.environment}-base-stor-gitaly-zfs]\"" | ||
data_disk_count = 9 | data_disk_name = "data" | ||
data_disk_size = "${var.data_disk_sizes["file"] / 8}" | data_disk_size = "${var.data_disk_sizes["file"]}" | ||
data_disk_type = "pd-ssd" | data_disk_type = "pd-ssd" | ||
deletion_protection = true | deletion_protection = true | ||
dns_zone_name = "${var.dns_zone_name}" | dns_zone_name = "${var.dns_zone_name}" | ||
egress_ports = "${var.egress_ports}" | egress_ports = "${var.egress_ports}" | ||
environment = "${var.environment}" | environment = "${var.environment}" | ||
ip_cidr_range = "${var.subnetworks["stor-zfs"]}" | ip_cidr_range = "${var.subnetworks["stor-zfs"]}" | ||
local_ssd_count = 2 | |||
log_disk_size = 10 | log_disk_size = 10 | ||
machine_type = "${var.machine_types["stor"]}" | machine_type = "${var.machine_types["stor"]}" | ||
name = "file-zfs" | name = "file-zfs" | ||
... | @@ -823,7 +824,7 @@ module "file-zfs" { | ... | @@ -823,7 +824,7 @@ module "file-zfs" { |
public_ports = "${var.public_ports["stor"]}" | public_ports = "${var.public_ports["stor"]}" | ||
region = "${var.region}" | region = "${var.region}" | ||
service_account_email = "${var.service_account_email}" | service_account_email = "${var.service_account_email}" | ||
source = "git::ssh://[email protected]/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://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.2.0" | ||
tier = "stor" | tier = "stor" | ||
use_new_node_name = true | use_new_node_name = true | ||
vpc = "gstg" | vpc = "gstg" | ||
... | ... |
Please register or sign in to comment