Merge pull request #207 from opdemand/205-update-amis

Fixed #205 -- updated with fresher AMIs.

Author: Gabriel Monroy

contrib/provision-ec2-controller.sh

@@ -28,21 +28,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-6da8356c
+  image=ami-d95ac4d8
 elif [ "$region" == "ap-southeast-1" ]; then
-  image=ami-a66f24f4
+  image=ami-1823694a
 elif [ "$region" == "ap-southeast-2" ]; then
-  image=ami-d5f66bef
+  image=ami-e56af7df
 elif [ "$region" == "eu-west-1" ]; then
-  image=ami-acbf5adb
+  image=ami-7447a003
 elif [ "$region" == "sa-east-1" ]; then
-  image=ami-f9fd5ae4
+  image=ami-334bec2e
 elif [ "$region" == "us-east-1" ]; then
-  image=ami-69f3bc00
+  image=ami-493d6a20
 elif [ "$region" == "us-west-1" ]; then
-  image=ami-f0695cb5
+  image=ami-0e2b1f4b
 elif [ "$region" == "us-west-2" ]; then
-  image=ami-ea1e82da
+  image=ami-72e27c42
 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-6da8356c',
-    'ap-southeast-1': 'ami-a66f24f4',
-    'ap-southeast-2': 'ami-d5f66bef',
-    'eu-west-1': 'ami-acbf5adb',
-    'sa-east-1': 'ami-f9fd5ae4',
-    'us-east-1': 'ami-69f3bc00',
-    'us-west-1': 'ami-f0695cb5',
-    'us-west-2': 'ami-ea1e82da',
+    'ap-northeast-1': 'ami-d95ac4d8',
+    'ap-southeast-1': 'ami-1823694a',
+    'ap-southeast-2': 'ami-e56af7df',
+    'eu-west-1': 'ami-7447a003',
+    'sa-east-1': 'ami-334bec2e',
+    'us-east-1': 'ami-493d6a20',
+    'us-west-1': 'ami-0e2b1f4b',
+    'us-west-2': 'ami-72e27c42',
 }