Merge pull request #164 from opdemand/123-update-amis

Fixed #123 -- updated EC2 AMIs and pointers to them.

Author: Gabriel Monroy

api/models.py

@@ -196,14 +196,14 @@ class Flavor(UuidAuditedModel):
     # 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-a57aeca4',
-        'ap-southeast-1': 'ami-e03a72b2',
-        'ap-southeast-2': 'ami-bd801287',
-        'eu-west-1': 'ami-d9d3cdad',
-        'sa-east-1': 'ami-a7df7bba',
-        'us-east-1': 'ami-e85a2081',
-        'us-west-1': 'ami-ac6942e9',
-        'us-west-2': 'ami-b55ac885',
+        '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',
     }
 
     class Meta:

contrib/check-deis-deps.sh

@@ -3,34 +3,34 @@
 # check for git
 if ! which git > /dev/null; then
   echo 'Please install git and ensure it is in your $PATH.'
-  exit
+  exit 1
 fi
 
 # check for RubyGems and friends
 if ! which ruby > /dev/null; then
   echo 'Please install ruby and ensure it is in your $PATH.'
-  exit
+  exit 1
 fi
 if ! which gem > /dev/null; then
   echo 'Please install RubyGems and ensure "gem" is in your $PATH.'
-  exit
+  exit 1
 fi
 if ! which bundle > /dev/null; then
   echo 'Please install the bundler ruby gem and ensure "bundle" is in your $PATH.'
-  exit
+  exit 1
 fi
 bundles=`bundle list | egrep 'berkshelf|chef|foodcritic|knife-' | wc -l`
 if ! [ $bundles -ge 4 ]; then
   echo 'Please run "bundle install" for required ruby gems.'
-  exit
+  exit 1
 fi
 
 # check for working knife
 if ! which knife > /dev/null; then
   echo 'Please install a knife-<provider> ruby gem and ensure "knife" is in your $PATH.'
-  exit
+  exit 1
 fi
 if ! knife client list > /dev/null; then
   echo 'Please ensure the knife.rb file is set up correctly for your Chef account.'
-  exit
+  exit 1
 fi

contrib/prepare-ubuntu-ami.sh

@@ -7,28 +7,32 @@
 #
 #   1. Launch a vanilla Ubuntu 12.04 instance (64-bit with an EBS root volume)
 #   2. SSH in and install the 3.8 kernel with:
-#      apt-get update && apt-get install -yq linux-generic-lts-raring && reboot
+#      apt-get update && apt-get install -yq linux-image-generic-lts-raring linux-headers-generic-lts-raring && reboot
 #   3. After reboot is complete, SSH in and `uname -r` to confirm kernel is 3.8
 #   4. Run this script (as root!) to optimize the image for fast boot times
 #   5. Create a new AMI from the root volume
 #   6. Distribute the AMI to other regions using `ec2-copy-image`
 #   7. Create/update your Deis flavors to use your new AMIs
 #
 
-# add docker ppa
-apt-add-repository ppa:dotcloud/lxc-docker -y
+# Add the Docker repository key to your local keychain
+# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
+curl https://get.docker.io/gpg | apt-key add -
+
+# Add the Docker repository to your apt sources list.
+echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
 
 # upgrade to latest packages
 apt-get update
 apt-get dist-upgrade -yq
 
 # install required packages
-apt-get install lxc-docker curl git python-setuptools python-pip -yq
+apt-get install lxc-docker curl git make python-setuptools python-pip -yq
 
 # create buildstep docker image
 git clone https://github.com/opdemand/buildstep.git
 cd buildstep
-./build.sh ./stack deis/buildstep
+make
 cd ..
 rm -rf buildstep
 

contrib/provision-ec2-controller.sh

@@ -7,12 +7,16 @@ fi
 
 # check for Deis' general dependencies
 thisdir=`dirname $0`
-$thisdir/check-deis-deps.sh
+if ! $thisdir/check-deis-deps.sh; then
+  echo 'Deis is missing some dependencies.'
+  exit 1
+fi
+
 
 # check for EC2 API tools in $PATH
 if ! which ec2-describe-group > /dev/null; then
   echo 'Please install the EC2 API command-line tools and ensure they are in your $PATH.'
-  exit
+  exit 1
 fi
 
 # check for AWS environment variables
@@ -24,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-a57aeca4
+  image=ami-6da8356c
 elif [ "$region" == "ap-southeast-1" ]; then
-  image=ami-e03a72b2
+  image=ami-a66f24f4
 elif [ "$region" == "ap-southeast-2" ]; then
-  image=ami-bd801287
+  image=ami-d5f66bef
 elif [ "$region" == "eu-west-1" ]; then
-  image=ami-d9d3cdad
+  image=ami-acbf5adb
 elif [ "$region" == "sa-east-1" ]; then
-  image=ami-a7df7bba
+  image=ami-f9fd5ae4
 elif [ "$region" == "us-east-1" ]; then
-  image=ami-e85a2081
+  image=ami-69f3bc00
 elif [ "$region" == "us-west-1" ]; then
-  image=ami-ac6942e9
+  image=ami-f0695cb5
 elif [ "$region" == "us-west-2" ]; then
-  image=ami-b55ac885
+  image=ami-ea1e82da
 else
   echo "Cannot find AMI for region: $region"
   exit 1