Updated EC2 AMIs for v0.4.0, fixes #458

deis · Jan 14, 2014 · 4ca1c43 · 4ca1c43
1 parent c1721ac
commit 4ca1c43
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 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-e31478e2
+  image=ami-5d432d5c
 elif [ "$region" == "ap-southeast-1" ]; then
-  image=ami-24421576
+  image=ami-b4c493e6
 elif [ "$region" == "ap-southeast-2" ]; then
-  image=ami-6338a759
+  image=ami-d59d03ef
 elif [ "$region" == "eu-west-1" ]; then
-  image=ami-6ed73c19
+  image=ami-ce30c5b9
 elif [ "$region" == "sa-east-1" ]; then
-  image=ami-510eaf4c
+  image=ami-61b1117c
 elif [ "$region" == "us-east-1" ]; then
-  image=ami-cb3a0fa2
+  image=ami-8df9c9e4
 elif [ "$region" == "us-west-1" ]; then
-  image=ami-d82d1e9d
+  image=ami-62477527
 elif [ "$region" == "us-west-2" ]; then
-  image=ami-5299fe62
+  image=ami-ea6001da
 else
   echo "Cannot find AMI for region: $region"
   exit 1

diff --git a/contrib/vagrant/prepare-ubuntu-box.sh b/contrib/vagrant/prepare-ubuntu-box.sh
@@ -81,7 +81,7 @@ find /var/log -type f | xargs rm
 rm -f /var/lib/dhcp3/*
 
 # Make sure Udev doesn't block our network, see: http://6.ptmc.org/?p=164
-rm /etc/udev/rules.d/70-persistent-net.rules
+rm -rf /etc/udev/rules.d/70-persistent-net.rules
 mkdir /etc/udev/rules.d/70-persistent-net.rules
 rm -rf /dev/.udev/
 rm /lib/udev/rules.d/75-persistent-net-generator.rules

diff --git a/provider/ec2.py b/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-e31478e2',
-    'ap-southeast-1': 'ami-24421576',
-    'ap-southeast-2': 'ami-6338a759',
-    'eu-west-1': 'ami-6ed73c19',
-    'sa-east-1': 'ami-510eaf4c',
-    'us-east-1': 'ami-cb3a0fa2',
-    'us-west-1': 'ami-d82d1e9d',
-    'us-west-2': 'ami-5299fe62',
+    'ap-northeast-1': 'ami-5d432d5c',
+    'ap-southeast-1': 'ami-b4c493e6',
+    'ap-southeast-2': 'ami-d59d03ef',
+    'eu-west-1': 'ami-ce30c5b9',
+    'sa-east-1': 'ami-61b1117c',
+    'us-east-1': 'ami-8df9c9e4',
+    'us-west-1': 'ami-62477527',
+    'us-west-2': 'ami-ea6001da',
 }