Skip to content

Commit 9eaf774

Browse files
author
Dougal Ballantyne
committed
Adding support for T2 instances; AMI updates
1 parent d27d020 commit 9eaf774

File tree

4 files changed

+41
-21
lines changed

4 files changed

+41
-21
lines changed

CHANGELOG.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ CHANGELOG
55
0.0.8
66
=====
77

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

1214
0.0.7

amis.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
us-west-2 ami-7dcab74d
2-
us-east-1 ami-2c07f944
3-
eu-west-1 ami-a1a169d6
4-
ap-northeast-1 ami-b3c78fb2
1+
us-west-2 ami-cfbbc4ff
2+
us-east-1 ami-705d9918
3+
eu-west-1 ami-d15892a6
4+
ap-northeast-1 ami-6d64306c

cli/cfncluster/examples/config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ key_name = mykey
2828
# (defaults to ec2-user for the default template)
2929
#cluster_user = ec2-user
3030
# Cluster Server EC2 instance type
31-
# (defaults to m3.medium for default template)
32-
#compute_instance_type = m3.medium
31+
# (defaults to t2.micro for default template)
32+
#compute_instance_type = t2.micro
3333
# Master Server EC2 instance type
34-
# (defaults to m3.medium for default template
35-
#master_instance_type = m3.medium
34+
# (defaults to t2.micro for default template
35+
#master_instance_type = t2.micro
3636
# Inital number of EC2 instances to launch as compute nodes in the cluster.
3737
# (defaults to 2 for default template)
3838
#initial_queue_size = 1
@@ -125,8 +125,8 @@ availability_zones =
125125
# (defaults to gp2 for default template)
126126
#volume_type = io1
127127
# Size of volume to be created if not using a snapshot
128-
# (defaults to 100GB for default template)
129-
#volume_size = 200
128+
# (defaults to 20GB for default template)
129+
#volume_size = 20
130130
# Number of IOPS for io1 type volumes
131131
#volume_iops = 200
132132
# Use encrypted volume (should not be used with snapshots)

cloudformation/cfncluster.cfn.json

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"MasterInstanceType" : {
1414
"Description" : "Master Server EC2 instance type",
1515
"Type" : "String",
16-
"Default" : "m3.medium",
16+
"Default" : "t2.micro",
1717
"ConstraintDescription" : "must be a valid EC2 instance type.",
1818
"AllowedValues" : [
1919
"cc2.8xlarge",
@@ -38,13 +38,16 @@
3838
"m3.xlarge",
3939
"m3.2xlarge",
4040
"hi1.4xlarge",
41-
"g2.2xlarge"
41+
"g2.2xlarge",
42+
"t2.micro",
43+
"t2.small",
44+
"t2.medium"
4245
]
4346
},
4447
"ComputeInstanceType" : {
4548
"Description" : "Cluster Server EC2 instance type",
4649
"Type" : "String",
47-
"Default" : "m3.medium",
50+
"Default" : "t2.micro",
4851
"ConstraintDescription" : "must be a valid EC2 instance type.",
4952
"AllowedValues" : [
5053
"cc2.8xlarge",
@@ -69,7 +72,10 @@
6972
"m3.xlarge",
7073
"m3.2xlarge",
7174
"hi1.4xlarge",
72-
"g2.2xlarge"
75+
"g2.2xlarge",
76+
"t2.micro",
77+
"t2.small",
78+
"t2.medium"
7379
]
7480
},
7581
"InitialQueueSize" : {
@@ -159,7 +165,7 @@
159165
"VolumeSize" : {
160166
"Description" : "Size of EBS volume in GB, if creating a new one",
161167
"Type" : "Number",
162-
"Default" : "100"
168+
"Default" : "20"
163169
},
164170
"VolumeType" : {
165171
"Description" : "Type of volume to create either new or from snapshot",
@@ -283,7 +289,7 @@
283289
"EncryptedEphemeral" : {
284290
"Description" : "Boolean flag to encrypt local ephemeral drives. The keys are in-memory and non-recoverable.",
285291
"Type" : "String",
286-
"Default" : "true",
292+
"Default" : "false",
287293
"ConstraintDescription" : "true/false",
288294
"AllowedValues" : [
289295
"true",
@@ -544,20 +550,32 @@
544550
"cg1.4xlarge" : {
545551
"Arch" : "64HVM",
546552
"EBSOpt" : "False"
553+
},
554+
"t2.micro" : {
555+
"Arch" : "64HVM",
556+
"EBSOpt" : "False"
557+
},
558+
"t2.small" : {
559+
"Arch" : "64HVM",
560+
"EBSOpt" : "False"
561+
},
562+
"t2.medium" : {
563+
"Arch" : "64HVM",
564+
"EBSOpt" : "False"
547565
}
548566
},
549567
"AWSRegionArch2AMI" : {
550568
"eu-west-1" : {
551-
"64HVM" : "ami-a1a169d6"
569+
"64HVM" : "ami-d15892a6"
552570
},
553571
"us-east-1" : {
554-
"64HVM" : "ami-2c07f944"
572+
"64HVM" : "ami-705d9918"
555573
},
556574
"ap-northeast-1" : {
557-
"64HVM" : "ami-b3c78fb2"
575+
"64HVM" : "ami-6d64306c"
558576
},
559577
"us-west-2" : {
560-
"64HVM" : "ami-7dcab74d"
578+
"64HVM" : "ami-cfbbc4ff"
561579
}
562580
}
563581
},

0 commit comments

Comments
 (0)