Merge branch 'jarv/allow-terminate' into 'master'

Allow terminate for bastion.

See merge request !373

environments/ops/main.tf

@@ -238,22 +238,23 @@ module "performance" {
 ##################################
 
 module "bastion" {
-  bootstrap_version     = 4
-  chef_provision        = "${var.chef_provision}"
-  chef_run_list         = "\"role[${var.environment}-base-bastion]\""
-  dns_zone_name         = "${var.dns_zone_name}"
-  environment           = "${var.environment}"
-  health_check          = "tcp"
-  ip_cidr_range         = "${var.subnetworks["bastion"]}"
-  machine_type          = "${var.machine_types["bastion"]}"
-  name                  = "bastion"
-  node_count            = "${var.node_count["bastion"]}"
-  project               = "${var.project}"
-  public_ports          = "${var.public_ports["bastion"]}"
-  region                = "${var.region}"
-  service_account_email = "${var.service_account_email}"
-  service_port          = 22
-  source                = "../../modules/google/generic-sv-with-group"
-  tier                  = "inf"
-  vpc                   = "${module.network.self_link}"
+  allow_stopping_for_update = true
+  bootstrap_version         = 4
+  chef_provision            = "${var.chef_provision}"
+  chef_run_list             = "\"role[${var.environment}-base-bastion]\""
+  dns_zone_name             = "${var.dns_zone_name}"
+  environment               = "${var.environment}"
+  health_check              = "tcp"
+  ip_cidr_range             = "${var.subnetworks["bastion"]}"
+  machine_type              = "${var.machine_types["bastion"]}"
+  name                      = "bastion"
+  node_count                = "${var.node_count["bastion"]}"
+  project                   = "${var.project}"
+  public_ports              = "${var.public_ports["bastion"]}"
+  region                    = "${var.region}"
+  service_account_email     = "${var.service_account_email}"
+  service_port              = 22
+  source                    = "../../modules/google/generic-sv-with-group"
+  tier                      = "inf"
+  vpc                       = "${module.network.self_link}"
 }