Skip to content

Fix: updating ami's in template #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2014
Merged

Fix: updating ami's in template #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions cloudformation/cfncluster.cfn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"AWSTemplateFormatVersion" : "2010-09-09",
"Description" : "AWS CloudFormation Sample Template cfncluster.cfn.json: Sample template showing an framework for deploying master + compute type clusters on AWS. **WARNING** This template creates AWS resources. You will be billed for the AWS resources used if you create a stack from this template. Version: ami-20140509-0 cfn-201400509-0",
"Description" : "AWS CloudFormation Sample Template cfncluster.cfn.json: Sample template showing an framework for deploying master + compute type clusters on AWS. **WARNING** This template creates AWS resources. You will be billed for the AWS resources used if you create a stack from this template. Version: ami-20140618-2 cfn-201400620-0",
"Parameters" : {
"KeyName" : {
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
Expand Down Expand Up @@ -438,9 +438,18 @@
]
},
"UseClusterPlacement" : {
"Fn::And": [
{ "Fn::Equals" : [ { "Ref" : "Placement" }, "cluster" ] },
{ "Condition" : "UsePlacementGroup" }
"Fn::And" : [
{
"Fn::Equals" : [
{
"Ref" : "Placement"
},
"cluster"
]
},
{
"Condition" : "UsePlacementGroup"
}
]
},
"UseEBSEncryption" : {
Expand Down Expand Up @@ -549,16 +558,16 @@
},
"AWSRegionArch2AMI" : {
"eu-west-1" : {
"64HVM" : "ami-e3458c94"
"64HVM" : "ami-a1a169d6"
},
"us-east-1" : {
"64HVM" : "ami-745ea11c"
"64HVM" : "ami-2c07f944"
},
"ap-northeast-1" : {
"64HVM" : "ami-2d41092c"
"64HVM" : "ami-b3c78fb2"
},
"us-west-2" : {
"64HVM" : "ami-e581fcd5"
"64HVM" : "ami-7dcab74d"
}
}
},
Expand Down