Added timeout variable (#20)

* Added timeout variable

* Remove trunk

* Address comments

Author: goruha

main.tf

@@ -340,8 +340,11 @@ resource "aws_security_group" "default" {
 }
 
 #
+
 # Full list of options:
+
 # http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options-general.html#command-options-general-elasticbeanstalkmanagedactionsplatformupdate
+
 #
 
 resource "aws_elastic_beanstalk_environment" "default" {
@@ -351,6 +354,8 @@ resource "aws_elastic_beanstalk_environment" "default" {
   tier                = "WebServer"
   solution_stack_name = "${var.solution_stack_name}"
 
+  wait_for_ready_timeout = "${var.wait_for_ready_timeout}"
+
   tags {
     Name      = "${module.label.id}"
     Namespace = "${var.namespace}"
@@ -510,7 +515,6 @@ resource "aws_elastic_beanstalk_environment" "default" {
     name      = "ListenerEnabled"
     value     = "${var.loadbalancer_certificate_arn == "" ? "false" : "true"}"
   }
-
   setting {
     namespace = "aws:elb:listener:${var.ssh_listener_port}"
     name      = "ListenerProtocol"
@@ -526,13 +530,11 @@ resource "aws_elastic_beanstalk_environment" "default" {
     name      = "ListenerEnabled"
     value     = "${var.ssh_listener_enabled}"
   }
-
   setting {
     namespace = "aws:elb:policies"
     name      = "ConnectionSettingIdleTimeout"
     value     = "${var.ssh_listener_enabled == "true" ? "3600" : "60"}"
   }
-
   setting {
     namespace = "aws:elb:policies"
     name      = "ConnectionDrainingEnabled"

variables.tf

@@ -108,6 +108,10 @@ variable "solution_stack_name" {
   default = ""
 }
 
+variable "wait_for_ready_timeout" {
+  default = "20m"
+}
+
 # From: http://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region
 # Via: https://github.com/hashicorp/terraform/issues/7071
 variable "alb_zone_id" {