Merge bac1bcd into a35c66b

deis · Mar 23, 2014 · 11eacae · 11eacae
2 parents a35c66b + bac1bcd
commit 11eacae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/contrib/ec2/provision-ec2-controller.sh b/contrib/ec2/provision-ec2-controller.sh
@@ -45,21 +45,21 @@ region=$1
 # see contrib/prepare-ubuntu-ami.sh for instructions
 # on creating your own deis-optmized AMIs
 if [ "$region" == "ap-northeast-1" ]; then
-  image=ami-55007154
+  image=ami-d3225fd2
 elif [ "$region" == "ap-southeast-1" ]; then
-  image=ami-4eb4e51c
+  image=ami-9e4919cc
 elif [ "$region" == "ap-southeast-2" ]; then
-  image=ami-6f5bc255
+  image=ami-afdb4395
 elif [ "$region" == "eu-west-1" ]; then
-  image=ami-c7ef12b0
+  image=ami-ebeb159c
 elif [ "$region" == "sa-east-1" ]; then
-  image=ami-3945e624
+  image=ami-cdcc6ed0
 elif [ "$region" == "us-east-1" ]; then
-  image=ami-c50408ac
+  image=ami-15382c7c
 elif [ "$region" == "us-west-1" ]; then
-  image=ami-963906d3
+  image=ami-f60d33b3
 elif [ "$region" == "us-west-2" ]; then
-  image=ami-606a0550
+  image=ami-ae85ec9e
 else
   echo "Cannot find AMI for region: $region"
   exit 1

diff --git a/controller/provider/ec2.py b/controller/provider/ec2.py
@@ -17,14 +17,14 @@
 # Deis-optimized EC2 amis -- with 3.8 kernel, chef 11 deps,
 # and large docker images (e.g. buildstep) pre-installed
 IMAGE_MAP = {
-    'ap-northeast-1': 'ami-59007158',
-    'ap-southeast-1': 'ami-4cb4e51e',
-    'ap-southeast-2': 'ami-6d5bc257',
-    'eu-west-1': 'ami-c3ef12b4',
-    'sa-east-1': 'ami-3b45e626',
-    'us-east-1': 'ami-d90408b0',
-    'us-west-1': 'ami-9c3906d9',
-    'us-west-2': 'ami-8c6a05bc',
+    'ap-northeast-1': 'ami-ae85ec9e',
+    'ap-southeast-1': 'ami-904919c2',
+    'ap-southeast-2': 'ami-a9db4393',
+    'eu-west-1': 'ami-01eb1576',
+    'sa-east-1': 'ami-d3cc6ece',
+    'us-east-1': 'ami-51382c38',
+    'us-west-1': 'ami-ec0d33a9',
+    'us-west-2': 'ami-a085ec90',
 }