Add redis-cache and adjust the machine types

environments/gprd/main.tf

@@ -185,6 +185,26 @@ module "redis" {
   vpc              = "${module.network.self_link}"
 }
 
+module "redis-cache" {
+  attach_data_disk = true
+  data_disk_size   = 100
+  data_disk_type   = "pd-ssd"
+  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["redis-cache"]}"
+  machine_type     = "${var.machine_types["redis-cache"]}"
+  name             = "redis-cache"
+  node_count       = "${var.node_count["redis-cache"]}"
+  project          = "${var.project}"
+  public_ports     = "${var.public_ports["redis-cache"]}"
+  region           = "${var.region}"
+  source           = "../../modules/google/generic-pet"
+  tier             = "db"
+  vpc              = "${module.network.self_link}"
+}
+
 ##################################
 #
 #  Sidekiq

environments/gprd/variables.tf

@@ -54,15 +54,16 @@ variable "machine_types" {
   type = "map"
 
   default = {
-    "api"                = "n1-standard-4"
+    "api"                = "n1-standard-8"
     "db"                 = "n1-standard-4"
     "pgb"                = "n1-standard-4"
     "exlb"               = "n1-standard-4"
-    "git"                = "n1-standard-4"
-    "redis"              = "n1-standard-4"
+    "git"                = "n1-standard-16"
+    "redis"              = "n1-highmem-2"
+    "redis-cache"        = "n1-highmem-16"
     "sidekiq-besteffort" = "n1-standard-4"
     "stor"               = "n1-standard-4"
-    "web"                = "n1-standard-4"
+    "web"                = "n1-standard-16"
   }
 }
 
@@ -76,6 +77,7 @@ variable "node_count" {
     "exlb"               = 1
     "git"                = 1
     "redis"              = 1
+    "redis-cache"        = 1
     "sidekiq-besteffort" = 1
     "stor"               = 1
     "web"                = 1
@@ -86,14 +88,15 @@ variable "subnetworks" {
   type = "map"
 
   default = {
-    "api"     = "10.220.2.0/23"
-    "db"      = "10.217.1.0/24"
-    "pgb"     = "10.217.4.0/24"
-    "exlb"    = "10.216.1.0/24"
-    "git"     = "10.220.4.0/23"
-    "redis"   = "10.217.2.0/24"
-    "sidekiq" = "10.220.6.0/23"
-    "stor"    = "10.221.2.0/23"
-    "web"     = "10.220.8.0/23"
+    "api"         = "10.220.2.0/23"
+    "db"          = "10.217.1.0/24"
+    "pgb"         = "10.217.4.0/24"
+    "exlb"        = "10.216.1.0/24"
+    "git"         = "10.220.4.0/23"
+    "redis"       = "10.217.2.0/24"
+    "redis-cache" = "10.217.5.0/24"
+    "sidekiq"     = "10.220.6.0/23"
+    "stor"        = "10.221.2.0/23"
+    "web"         = "10.220.8.0/23"
   }
 }