Merge release branch into master [skip ci]

nubisproject · Nov 2, 2017 · 9063445 · 9063445
2 parents f013a19 + f79f338
commit 9063445
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Change Log
 
+## [v2.0.3](https://github.com/nubisproject/nubis-terraform/tree/v2.0.3) (2017-11-02)
+[Full Changelog](https://github.com/nubisproject/nubis-terraform/compare/v2.0.2...v2.0.3)
+
+**Closed issues:**
+
+- \[load\_balancer\] Expose knob for idle\_timeout [\#127](https://github.com/nubisproject/nubis-terraform/issues/127)
+
+**Merged pull requests:**
+
+- Add additonal metrics in worker module [\#130](https://github.com/nubisproject/nubis-terraform/pull/130) ([limed](https://github.com/limed))
+- Fixes \#127 by adding ability to configure idle\_timeout [\#128](https://github.com/nubisproject/nubis-terraform/pull/128) ([danielhartnell](https://github.com/danielhartnell))
+
+## [v2.0.2](https://github.com/nubisproject/nubis-terraform/tree/v2.0.2) (2017-10-24)
+[Full Changelog](https://github.com/nubisproject/nubis-terraform/compare/v2.0.1...v2.0.2)
+
+**Closed issues:**
+
+- Tag v2.0.2 release [\#124](https://github.com/nubisproject/nubis-terraform/issues/124)
+
+**Merged pull requests:**
+
+- Merge v2.0.2 release into develop. \[skip ci\] [\#126](https://github.com/nubisproject/nubis-terraform/pull/126) ([tinnightcap](https://github.com/tinnightcap))
+- Update CHANGELOG for v2.0.2 release \[skip ci\] [\#125](https://github.com/nubisproject/nubis-terraform/pull/125) ([tinnightcap](https://github.com/tinnightcap))
+
 ## [v2.0.1](https://github.com/nubisproject/nubis-terraform/tree/v2.0.1) (2017-10-13)
 [Full Changelog](https://github.com/nubisproject/nubis-terraform/compare/v2.0.0...v2.0.1)
 

diff --git a/load_balancer/main.tf b/load_balancer/main.tf
@@ -102,7 +102,7 @@ resource "aws_elb" "load_balancer" {
   }
 
   cross_zone_load_balancing   = true
-  idle_timeout                = 60
+  idle_timeout                = "${var.idle_timeout}"
   connection_draining         = true
   connection_draining_timeout = 60
   internal                    = "${var.internal}"

diff --git a/load_balancer/variables.tf b/load_balancer/variables.tf
@@ -67,3 +67,7 @@ variable "internal" {
 variable "arena" {
   default = "core"
 }
+
+variable "idle_timeout" {
+  default = "60"
+}
diff --git a/worker/main.tf b/worker/main.tf
@@ -135,6 +135,10 @@ resource "aws_autoscaling_group" "asg" {
     "GroupMaxSize",
     "GroupDesiredCapacity",
     "GroupInServiceInstances",
+    "GroupPendingInstances",
+    "GroupStandbyInstances",
+    "GroupTerminatingInstances",
+    "GroupTotalInstances",
   ]
 
   tag {