Merge pull request #595 from jeremiahsnapp/add-default-InstanceCreationTimeout-for-windows

Add default InstanceCreationTimeout value for windows instances

Author: Lachlan Donald

templates/aws-stack.yml

@@ -233,7 +233,7 @@ Parameters:
   InstanceCreationTimeout:
     Description: Timeout period for Autoscaling Group Creation Policy
     Type: String
-    Default: "PT5M"
+    Default: ""
 
   RootVolumeSize:
     Description: Size of each instance's root EBS volume (in GB)
@@ -406,6 +406,9 @@ Conditions:
     UseDefaultAMI:
       !Equals [ !Ref ImageId, "" ]
 
+    UseDefaultInstanceCreationTimeout:
+      !Equals [ !Ref InstanceCreationTimeout, "" ]
+
     UseDefaultRootVolumeName:
       !Equals [ !Ref RootVolumeName, "" ]
 
@@ -836,7 +839,7 @@ Resources:
         - ClosestToNextInstanceHour
     CreationPolicy:
       ResourceSignal:
-        Timeout: !Ref InstanceCreationTimeout
+        Timeout: !If [ UseDefaultInstanceCreationTimeout, !If [ UseWindowsAgents, PT10M, PT5M ], !Ref InstanceCreationTimeout ]
         Count: !Ref MinSize
     UpdatePolicy:
       AutoScalingReplacingUpdate: