From 06bc9ecc682a285c57deed52ffe9d5c2745a20b1 Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@gitlab.com>
Date: Tue, 8 May 2018 10:16:47 +0200
Subject: [PATCH] Increase pubsub capacity.

---
 environments/gprd/main.tf      | 33 +++++++++++++++++----------------
 environments/gprd/variables.tf |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/environments/gprd/main.tf b/environments/gprd/main.tf
index 91e071f2..85f2b936 100644
--- a/environments/gprd/main.tf
+++ b/environments/gprd/main.tf
@@ -737,22 +737,23 @@ module "consul" {
 ##################################
 
 module "pubsubbeat" {
-  bootstrap_version = 3
-  names             = "${var.pubsubbeats["names"]}"
-  machine_types     = "${var.pubsubbeats["machine_types"]}"
-  chef_provision    = "${var.chef_provision}"
-  chef_run_list     = "\"role[gprd-infra-consul]\""
-  dns_zone_name     = "${var.dns_zone_name}"
-  environment       = "${var.environment}"
-  ip_cidr_range     = "${var.subnetworks["pubsubbeat"]}"
-  project           = "${var.project}"
-  public_ports      = "${var.public_ports["pubsubbeat"]}"
-  region            = "${var.region}"
-  health_check      = "tcp"
-  service_port      = 22
-  source            = "../../modules/google/pubsubbeat"
-  tier              = "inf"
-  vpc               = "${module.network.self_link}"
+  bootstrap_version         = 3
+  allow_stopping_for_update = true
+  names                     = "${var.pubsubbeats["names"]}"
+  machine_types             = "${var.pubsubbeats["machine_types"]}"
+  chef_provision            = "${var.chef_provision}"
+  chef_run_list             = "\"role[gprd-infra-consul]\""
+  dns_zone_name             = "${var.dns_zone_name}"
+  environment               = "${var.environment}"
+  ip_cidr_range             = "${var.subnetworks["pubsubbeat"]}"
+  project                   = "${var.project}"
+  public_ports              = "${var.public_ports["pubsubbeat"]}"
+  region                    = "${var.region}"
+  health_check              = "tcp"
+  service_port              = 22
+  source                    = "../../modules/google/pubsubbeat"
+  tier                      = "inf"
+  vpc                       = "${module.network.self_link}"
 
   service_account_email = "${var.service_account_email}"
 }
diff --git a/environments/gprd/variables.tf b/environments/gprd/variables.tf
index 101120b5..d129eb93 100644
--- a/environments/gprd/variables.tf
+++ b/environments/gprd/variables.tf
@@ -91,7 +91,7 @@ variable "pubsubbeats" {
 
   default = {
     "names"         = ["gitaly", "haproxy", "pages", "postgres", "production", "system", "workhorse", "geo"]
-    "machine_types" = ["n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1"]
+    "machine_types" = ["n1-standard-16", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-8", "n1-standard-1", "n1-standard-8", "n1-standard-1"]
   }
 }
 
-- 
GitLab