Adding support for T2 instances; AMI updates

Author: Dougal Ballantyne

CHANGELOG.rst

@@ -5,8 +5,10 @@ CHANGELOG
 0.0.8
 =====
 
+* feature:``cfncluster``: Added support for new T2 instances
+* updates:``cfncluster``: Changed default instance sizes to t2.micro(free tier)
+* updates:``cfncluster``: Changed EBS volume default size to 20GB(free tier)
 * updates:``ami``: Pulled latest CentOS errata
-* bugfix:``cfncluster``: Fixed issues with attaching encrypted EBS volumes
 * bugfix:``cfncluster``: Fixed issues with install_type option(removed)
 
 0.0.7

amis.txt

@@ -1,4 +1,4 @@
-us-west-2 ami-7dcab74d
-us-east-1 ami-2c07f944
-eu-west-1 ami-a1a169d6
-ap-northeast-1 ami-b3c78fb2
+us-west-2 ami-cfbbc4ff
+us-east-1 ami-705d9918
+eu-west-1 ami-d15892a6
+ap-northeast-1 ami-6d64306c

cli/cfncluster/examples/config

@@ -28,11 +28,11 @@ key_name = mykey
 # (defaults to ec2-user for the default template)
 #cluster_user = ec2-user
 # Cluster Server EC2 instance type
-# (defaults to m3.medium for default template)
-#compute_instance_type = m3.medium
+# (defaults to t2.micro for default template)
+#compute_instance_type = t2.micro
 # Master Server EC2 instance type
-# (defaults to m3.medium for default template
-#master_instance_type = m3.medium
+# (defaults to t2.micro for default template
+#master_instance_type = t2.micro
 # Inital number of EC2 instances to launch as compute nodes in the cluster.
 # (defaults to 2 for default template)
 #initial_queue_size = 1
@@ -125,8 +125,8 @@ availability_zones =
 # (defaults to gp2 for default template)
 #volume_type = io1
 # Size of volume to be created if not using a snapshot
-# (defaults to 100GB for default template)
-#volume_size = 200
+# (defaults to 20GB for default template)
+#volume_size = 20
 # Number of IOPS for io1 type volumes
 #volume_iops = 200
 # Use encrypted volume (should not be used with snapshots)

cloudformation/cfncluster.cfn.json

@@ -13,7 +13,7 @@
     "MasterInstanceType" : {
       "Description" : "Master Server EC2 instance type",
       "Type" : "String",
-      "Default" : "m3.medium",
+      "Default" : "t2.micro",
       "ConstraintDescription" : "must be a valid EC2 instance type.",
       "AllowedValues" : [
         "cc2.8xlarge",
@@ -38,13 +38,16 @@
         "m3.xlarge",
         "m3.2xlarge",
         "hi1.4xlarge",
-        "g2.2xlarge"
+        "g2.2xlarge",
+        "t2.micro",
+        "t2.small",
+        "t2.medium"
       ]
     },
     "ComputeInstanceType" : {
       "Description" : "Cluster Server EC2 instance type",
       "Type" : "String",
-      "Default" : "m3.medium",
+      "Default" : "t2.micro",
       "ConstraintDescription" : "must be a valid EC2 instance type.",
       "AllowedValues" : [
         "cc2.8xlarge",
@@ -69,7 +72,10 @@
         "m3.xlarge",
         "m3.2xlarge",
         "hi1.4xlarge",
-        "g2.2xlarge"
+        "g2.2xlarge",
+        "t2.micro",
+        "t2.small",
+        "t2.medium"
       ]
     },
     "InitialQueueSize" : {
@@ -159,7 +165,7 @@
     "VolumeSize" : {
       "Description" : "Size of EBS volume in GB, if creating a new one",
       "Type" : "Number",
-      "Default" : "100"
+      "Default" : "20"
     },
     "VolumeType" : {
       "Description" : "Type of volume to create either new or from snapshot",
@@ -283,7 +289,7 @@
     "EncryptedEphemeral" : {
       "Description" : "Boolean flag to encrypt local ephemeral drives. The keys are in-memory and non-recoverable.",
       "Type" : "String",
-      "Default" : "true",
+      "Default" : "false",
       "ConstraintDescription" : "true/false",
       "AllowedValues" : [
         "true",
@@ -544,20 +550,32 @@
       "cg1.4xlarge" : {
         "Arch" : "64HVM",
         "EBSOpt" : "False"
+      },
+      "t2.micro" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "False"
+      },
+      "t2.small" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "False"
+      },
+      "t2.medium" : {
+        "Arch" : "64HVM",
+        "EBSOpt" : "False"
       }
     },
     "AWSRegionArch2AMI" : {
       "eu-west-1" : {
-        "64HVM" : "ami-a1a169d6"
+        "64HVM" : "ami-d15892a6"
       },
       "us-east-1" : {
-        "64HVM" : "ami-2c07f944"
+        "64HVM" : "ami-705d9918"
       },
       "ap-northeast-1" : {
-        "64HVM" : "ami-b3c78fb2"
+        "64HVM" : "ami-6d64306c"
       },
       "us-west-2" : {
-        "64HVM" : "ami-7dcab74d"
+        "64HVM" : "ami-cfbbc4ff"
       }
     }
   },