From d96cab720884c6b03ebc48e4aaa00c5b35ece02d Mon Sep 17 00:00:00 2001
From: Dougal Ballantyne <dougalb at gmail dot com>
Date: Fri, 20 Jun 2014 08:38:18 -0700
Subject: [PATCH] Fix: updating ami's in template

---
 cloudformation/cfncluster.cfn.json | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/cloudformation/cfncluster.cfn.json b/cloudformation/cfncluster.cfn.json
index 74d59e8c89..731f0d6e18 100644
--- a/cloudformation/cfncluster.cfn.json
+++ b/cloudformation/cfncluster.cfn.json
@@ -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",
@@ -438,9 +438,18 @@
       ]
     },
     "UseClusterPlacement" : {
-      "Fn::And": [
-        { "Fn::Equals" : [ { "Ref" : "Placement" }, "cluster" ] },
-        { "Condition" : "UsePlacementGroup" }
+      "Fn::And" : [
+        {
+          "Fn::Equals" : [
+            {
+              "Ref" : "Placement"
+            },
+            "cluster"
+          ]
+        },
+        {
+          "Condition" : "UsePlacementGroup"
+        }
       ]
     },
     "UseEBSEncryption" : {
@@ -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"
       }
     }
   },