Update instance type list

Add t2.xlarge/t2.2xlarge, x1.16xlarge, r4.*, f1.*, and i3.* instance
types to the supported list.

Signed-off-by: Brian Barrett <[email protected]>

Author: bwbarrett

cloudformation/cfncluster.cfn.json

@@ -727,10 +727,22 @@
         "r3.2xlarge",
         "r3.xlarge",
         "r3.large",
+        "r4.large",
+        "r4.xlarge",
+        "r4.2xlarge",
+        "r4.4xlarge",
+        "r4.8xlarge",
+        "r4.16xlarge",
         "i2.8xlarge",
         "i2.4xlarge",
         "i2.2xlarge",
         "i2.xlarge",
+        "i3.large",
+        "i3.xlarge",
+        "i3.2xlarge",
+        "i3.4xlarge",
+        "i3.8xlarge",
+        "i3.16xlarge",
         "cr1.8xlarge",
         "cg1.4xlarge",
         "m3.medium",
@@ -747,6 +759,8 @@
         "t2.small",
         "t2.medium",
         "t2.large",
+        "t2.xlarge",
+        "t2.2xlarge",
         "d2.8xlarge",
         "d2.4xlarge",
         "d2.2xlarge",
@@ -757,7 +771,10 @@
         "m4.4xlarge",
         "m4.10xlarge",
         "m4.16xlarge",
-        "x1.32xlarge"
+        "x1.16xlarge",
+        "x1.32xlarge",
+        "f1.2xlarge",
+        "f1.16xlarge"
       ]
     },
     "ComputeInstanceType" : {
@@ -782,10 +799,22 @@
         "r3.2xlarge",
         "r3.xlarge",
         "r3.large",
+        "r4.large",
+        "r4.xlarge",
+        "r4.2xlarge",
+        "r4.4xlarge",
+        "r4.8xlarge",
+        "r4.16xlarge",
         "i2.8xlarge",
         "i2.4xlarge",
         "i2.2xlarge",
         "i2.xlarge",
+        "i3.large",
+        "i3.xlarge",
+        "i3.2xlarge",
+        "i3.4xlarge",
+        "i3.8xlarge",
+        "i3.16xlarge",
         "cr1.8xlarge",
         "cg1.4xlarge",
         "m3.medium",
@@ -802,6 +831,8 @@
         "t2.small",
         "t2.medium",
         "t2.large",
+        "t2.xlarge",
+        "t2.2xlarge",
         "d2.8xlarge",
         "d2.4xlarge",
         "d2.2xlarge",
@@ -812,7 +843,10 @@
         "m4.4xlarge",
         "m4.10xlarge",
         "m4.16xlarge",
-        "x1.32xlarge"
+        "x1.16xlarge",
+        "x1.32xlarge",
+        "f1.2xlarge",
+        "f1.16xlarge"
       ]
     },
     "InitialQueueSize" : {
@@ -1578,7 +1612,7 @@
         "Arch" : "64HVM",
         "EBSOpt" : "True"
       },
-      "p2.large" : {
+      "p2.xlarge" : {
         "Arch" : "64HVM",
         "EBSOpt" : "True"
       },
@@ -1666,6 +1700,34 @@
         "Arch" : "64HVM",
         "EBSOpt" : "False"
       },
+      "r3.xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "r4.large" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "r4.xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "r4.2xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "r4.4xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "r4.8xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "r4.16xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
       "i2.8xlarge" : {
         "Arch" : "64HVM",
         "EBSOpt" : "False"
@@ -1686,10 +1748,38 @@
         "Arch" : "64HVM",
         "EBSOpt" : "False"
       },
+      "i3.large" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "i3.xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "i3.2xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "i3.4xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "i3.8xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "i3.16xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
       "cg1.4xlarge" : {
         "Arch" : "64HVM",
         "EBSOpt" : "False"
       },
+      "t2.nano" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "False"
+      },
       "t2.micro" : {
         "Arch" : "64HVM",
         "EBSOpt" : "False"
@@ -1702,6 +1792,18 @@
         "Arch" : "64HVM",
         "EBSOpt" : "False"
       },
+      "t2.large" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "False"
+      },
+      "t2.xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "False"
+      },
+      "t2.2xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "False"
+      },
       "d2.8xlarge" : {
         "Arch" : "64HVM",
         "EBSOpt" : "True"
@@ -1718,14 +1820,22 @@
         "Arch" : "64HVM",
         "EBSOpt" : "True"
       },
-      "t2.large" : {
+      "x1.16xlarge" : {
         "Arch" : "64HVM",
-        "EBSOpt" : "False"
+        "EBSOpt" : "True"
       },
       "x1.32xlarge" : {
         "Arch" : "64HVM",
         "EBSOpt" : "True"
       },
+      "f1.2xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
+      "f1.16xlarge" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "True"
+      },
       "m4.16xlarge" : {
         "Arch" : "64HVM",
         "EBSOpt" : "True"
@@ -1749,10 +1859,6 @@
       "m4.large" : {
         "Arch" : "64HVM",
         "EBSOpt" : "True"
-      },
-      "t2.nano" : {
-        "Arch" : "64HVM",
-        "EBSOpt" : "False"
       }
     },
     "AWSRegionOS2AMI" : {
@@ -4114,4 +4220,4 @@
       "Condition" : "MasterPublicIp"
     }
   }
-}
+}