Merge pull request #583 from opdemand/new-amis

Updated EC2 AMIs from prep scripts.

Author: mboersma

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-ed7503ec
+  image=ami-55007154
 elif [ "$region" == "ap-southeast-1" ]; then
-  image=ami-76673624
+  image=ami-4eb4e51c
 elif [ "$region" == "ap-southeast-2" ]; then
-  image=ami-7dbb2247
+  image=ami-6f5bc255
 elif [ "$region" == "eu-west-1" ]; then
-  image=ami-bd31c3ca
+  image=ami-c7ef12b0
 elif [ "$region" == "sa-east-1" ]; then
-  image=ami-2964c734
+  image=ami-3945e624
 elif [ "$region" == "us-east-1" ]; then
-  image=ami-f9080a90
+  image=ami-c50408ac
 elif [ "$region" == "us-west-1" ]; then
-  image=ami-148bb751
+  image=ami-963906d3
 elif [ "$region" == "us-west-2" ]; then
-  image=ami-f082eec0
+  image=ami-606a0550
 else
   echo "Cannot find AMI for region: $region"
   exit 1

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-f37503f2',
-    'ap-southeast-1': 'ami-7867362a',
-    'ap-southeast-2': 'ami-71bb224b',
-    'eu-west-1': 'ami-af31c3d8',
-    'sa-east-1': 'ami-2b64c736',
-    'us-east-1': 'ami-c1080aa8',
-    'us-west-1': 'ami-1c8bb759',
-    'us-west-2': 'ami-f282eec2',
+    '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',
 }