Commit d595c12f authored by Ahmad Sherif's avatar Ahmad Sherif

Remove postgres-zfs module

parent 72230427
......@@ -250,7 +250,6 @@ variable "public_ports" {
"deploy" = []
"runner" = []
"db-dr" = []
"db-zfs" = []
"pgb" = []
"fe-lb" = [22, 80, 443]
"git" = []
......@@ -333,7 +332,6 @@ variable "machine_types" {
"contributors" = "n1-standard-4"
"contributors-db" = "db-custom-1-4096"
"db-dr" = "n1-standard-8"
"db-zfs" = "n1-highmem-64"
"console" = "n1-standard-1"
"deploy" = "n1-standard-2"
"fe-lb" = "n1-standard-4"
......@@ -383,7 +381,6 @@ variable "node_count" {
"console" = 1
"consul" = 5
"db-dr" = 2
"db-zfs" = 1
"deploy" = 1
"fe-lb" = 16
"fe-lb-altssh" = 2
......@@ -444,7 +441,6 @@ variable "subnetworks" {
"redis" = "10.217.2.0/24"
"db-dr-delayed" = "10.217.3.0/24"
"db-dr-archive" = "10.217.7.0/24"
"db-zfs" = "10.220.19.0/24"
"patroni" = "10.220.16.0/24"
"pgb" = "10.217.4.0/24"
"redis-cache" = "10.217.5.0/24"
......
......@@ -242,7 +242,6 @@ variable "public_ports" {
"deploy" = []
"runner" = []
"db-dr" = []
"db-zfs" = []
"pgb" = []
"fe-lb" = [22, 80, 443]
"git" = []
......@@ -328,7 +327,6 @@ variable "machine_types" {
"deploy" = "n1-standard-2"
"runner" = "n1-standard-2"
"db-dr" = "n1-standard-8"
"db-zfs" = "n1-highmem-64"
"fe-lb" = "n1-standard-4"
"git" = "n1-standard-16"
"influxdb" = "n1-standard-4"
......@@ -379,7 +377,6 @@ variable "node_count" {
"runner" = 1
"consul" = 5
"db-dr" = 2
"db-zfs" = 2
"fe-lb" = 3
"fe-lb-pages" = 2
"fe-lb-altssh" = 2
......@@ -434,7 +431,6 @@ variable "subnetworks" {
"consul" = "10.224.4.0/24"
"db-dr-delayed" = "10.224.24.0/24"
"db-dr-archive" = "10.224.25.0/24"
"db-zfs" = "10.226.6.0/24"
"deploy" = "10.224.15.0/24"
"fe-lb" = "10.224.14.0/24"
"fe-lb-altssh" = "10.224.19.0/24"
......
......@@ -422,33 +422,6 @@ module "postgres-dr-delayed" {
os_disk_size = 100
}
module "postgres-zfs" {
bootstrap_version = "9"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-postgres-zfs]\""
data_disk_count = 3
data_disk_size = 2000
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["db-zfs"]}"
kernel_version = "4.18.0-1007"
machine_type = "${var.machine_types["db-zfs"]}"
name = "postgres-zfs"
node_count = "${var.node_count["db-zfs"]}"
os_boot_image = "ubuntu-os-cloud/ubuntu-1804-bionic-v20190307"
os_disk_size = 32
os_disk_type = "pd-ssd"
project = "${var.project}"
public_ports = "${var.public_ports["db-zfs"]}"
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=zfs"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "postgres-backup" {
environment = "${var.environment}"
gcs_postgres_backup_service_account = "${var.gcs_postgres_backup_service_account}"
......
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