Commit f0af63c2 authored by Craig Furman's avatar Craig Furman

Remove unused gstg module "file-zfs-single-zone"

It had 0 instances. We can bring it back if we need it.
parent 16e9975d
......@@ -830,43 +830,6 @@ module "file-zfs" {
vpc = "gstg"
}
# The same as the above "file-zfs" module, except with a specified zone into
# which all instances will be provisioned. The generic-stor module still (at the
# time of writing) supports the ability to implement this zone "overweightness"
# in 1 module declaration, but we want to deprecate that feature as it adds code
# duplication and complexity. "file" is the only consumer of this feature across
# our environments, and once we migrate to file-zfs we can delete the feature.
# Leaving this module commented because it may never be needed.
# module "file-zfs-single-zone" {
# bootstrap_data_disk = false
# bootstrap_version = 9
# chef_provision = "${var.chef_provision}"
# data_disk_name = "data"
# chef_run_list = "\"role[${var.environment}-base-stor-gitaly-zfs]\""
# 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-single-zone"]}"
# local_ssd_count = 2
# 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=v1.2.0"
# tier = "stor"
# use_new_node_name = true
# vpc = "gstg"
# zone = "us-east1-d"
# }
##################################
#
# Storage nodes for
......
......@@ -414,7 +414,6 @@ variable "node_count" {
"sidekiq-traces" = 0
"stor" = 2
"stor-zfs" = 1
"stor-zfs-single-zone" = 0
"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