Storage servers for gprd.

environments/gprd/main.tf

@@ -251,7 +251,7 @@ module "sidekiq" {
 
 ##################################
 #
-#  Storage
+#  Storage nodes for repositories
 #
 ##################################
 
@@ -278,6 +278,139 @@ module "file" {
   vpc            = "${module.network.self_link}"
 }
 
+##################################
+#
+#  Storage nodes for
+#  uploads/lfs/pages/artifacts/builds/cache
+#
+##################################
+
+module "uploads" {
+  attach_data_disk = true
+
+  data_disk_size = 16000
+  data_disk_type = "pd-standard"
+  chef_provision = "${var.chef_provision}"
+  chef_run_list  = "${var.base_chef_run_list}"
+  dns_zone_name  = "${var.dns_zone_name}"
+  environment    = "${var.environment}"
+  ip_cidr_range  = "${var.subnetworks["uploads"]}"
+  machine_type   = "${var.machine_types["stor"]}"
+  name           = "uploads"
+  node_count     = "${var.node_count["uploads"]}"
+  project        = "${var.project}"
+  public_ports   = "${var.public_ports["stor"]}"
+  region         = "${var.region}"
+  source         = "../../modules/google/generic-pet"
+  tier           = "stor"
+  vpc            = "${module.network.self_link}"
+}
+
+module "lfs" {
+  attach_data_disk = true
+
+  data_disk_size = 16000
+  data_disk_type = "pd-standard"
+  chef_provision = "${var.chef_provision}"
+  chef_run_list  = "${var.base_chef_run_list}"
+  dns_zone_name  = "${var.dns_zone_name}"
+  environment    = "${var.environment}"
+  ip_cidr_range  = "${var.subnetworks["lfs"]}"
+  machine_type   = "${var.machine_types["stor"]}"
+  name           = "lfs"
+  node_count     = "${var.node_count["lfs"]}"
+  project        = "${var.project}"
+  public_ports   = "${var.public_ports["stor"]}"
+  region         = "${var.region}"
+  source         = "../../modules/google/generic-pet"
+  tier           = "stor"
+  vpc            = "${module.network.self_link}"
+}
+
+module "pages" {
+  attach_data_disk = true
+
+  data_disk_size = 16000
+  data_disk_type = "pd-standard"
+  chef_provision = "${var.chef_provision}"
+  chef_run_list  = "${var.base_chef_run_list}"
+  dns_zone_name  = "${var.dns_zone_name}"
+  environment    = "${var.environment}"
+  ip_cidr_range  = "${var.subnetworks["pages"]}"
+  machine_type   = "${var.machine_types["stor"]}"
+  name           = "pages"
+  node_count     = "${var.node_count["pages"]}"
+  project        = "${var.project}"
+  public_ports   = "${var.public_ports["stor"]}"
+  region         = "${var.region}"
+  source         = "../../modules/google/generic-pet"
+  tier           = "stor"
+  vpc            = "${module.network.self_link}"
+}
+
+module "artifacts" {
+  attach_data_disk = true
+
+  data_disk_size = 16000
+  data_disk_type = "pd-standard"
+  chef_provision = "${var.chef_provision}"
+  chef_run_list  = "${var.base_chef_run_list}"
+  dns_zone_name  = "${var.dns_zone_name}"
+  environment    = "${var.environment}"
+  ip_cidr_range  = "${var.subnetworks["artifacts"]}"
+  machine_type   = "${var.machine_types["stor"]}"
+  name           = "artifacts"
+  node_count     = "${var.node_count["artifacts"]}"
+  project        = "${var.project}"
+  public_ports   = "${var.public_ports["stor"]}"
+  region         = "${var.region}"
+  source         = "../../modules/google/generic-pet"
+  tier           = "stor"
+  vpc            = "${module.network.self_link}"
+}
+
+module "builds" {
+  attach_data_disk = true
+
+  data_disk_size = 16000
+  data_disk_type = "pd-standard"
+  chef_provision = "${var.chef_provision}"
+  chef_run_list  = "${var.base_chef_run_list}"
+  dns_zone_name  = "${var.dns_zone_name}"
+  environment    = "${var.environment}"
+  ip_cidr_range  = "${var.subnetworks["builds"]}"
+  machine_type   = "${var.machine_types["stor"]}"
+  name           = "builds"
+  node_count     = "${var.node_count["builds"]}"
+  project        = "${var.project}"
+  public_ports   = "${var.public_ports["stor"]}"
+  region         = "${var.region}"
+  source         = "../../modules/google/generic-pet"
+  tier           = "stor"
+  vpc            = "${module.network.self_link}"
+}
+
+module "cache" {
+  attach_data_disk = true
+
+  data_disk_size = 16000
+  data_disk_type = "pd-standard"
+  chef_provision = "${var.chef_provision}"
+  chef_run_list  = "${var.base_chef_run_list}"
+  dns_zone_name  = "${var.dns_zone_name}"
+  environment    = "${var.environment}"
+  ip_cidr_range  = "${var.subnetworks["cache"]}"
+  machine_type   = "${var.machine_types["stor"]}"
+  name           = "cache"
+  node_count     = "${var.node_count["cache"]}"
+  project        = "${var.project}"
+  public_ports   = "${var.public_ports["stor"]}"
+  region         = "${var.region}"
+  source         = "../../modules/google/generic-pet"
+  tier           = "stor"
+  vpc            = "${module.network.self_link}"
+}
+
 ##################################
 #
 #  External LoadBalancer

environments/gprd/variables.tf

@@ -85,6 +85,12 @@ variable "node_count" {
     "sidekiq-besteffort" = 1
     "stor"               = 1
     "web"                = 1
+    "uploads"            = 1
+    "lfs"                = 1
+    "pages"              = 1
+    "artifacts"          = 1
+    "builds"             = 1
+    "cache"              = 1
   }
 }
 
@@ -103,6 +109,19 @@ variable "subnetworks" {
     "sidekiq"     = "10.220.6.0/23"
     "stor"        = "10.221.2.0/23"
     "web"         = "10.220.8.0/23"
+
+    ###############################
+    # These will eventually (tm) be
+    # moved to object storage
+
+    "uploads"   = "10.221.4.0/27"   # 10.221.4.0 - 10.221.4.31
+    "lfs"       = "10.221.4.32/27"  # 10.221.4.32 - 10.221.4.63
+    "pages"     = "10.221.4.64/27"  # 10.221.4.64 - 10.221.4.95
+    "artifacts" = "10.221.4.96/27"  # 10.221.4.96 - 10.221.4.127
+    "builds"    = "10.221.4.128/27" # 10.221.4.128 - 10.221.4.159
+    "cache"     = "10.221.4.160/27" # 10.221.4.160 - 10.221.4.191
+
+    #############################
   }
 }