Skip to content

Commit 85928c3

Browse files
committed
Updated EC2 AMIs for v0.5.1, fixes #567.
1 parent 38d12e9 commit 85928c3

7 files changed

Lines changed: 29 additions & 29 deletions

File tree

contrib/ec2/prepare-controller-ami.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# Instructions:
77
#
88
# 1. Launch a vanilla Ubuntu 12.04 instance (64-bit with an EBS root volume)
9-
# 2. SSH in and install the 3.8 kernel with:
10-
# apt-get update && apt-get install -yq linux-image-generic-lts-raring linux-headers-generic-lts-raring && reboot
11-
# 3. After reboot is complete, SSH in and `uname -r` to confirm kernel is 3.8
9+
# 2. SSH in and install the 3.11 kernel as root with:
10+
# apt-get update && apt-get install -yq linux-image-generic-lts-saucy linux-headers-generic-lts-saucy && reboot
11+
# 3. After reboot is complete, SSH in and `uname -r` to confirm kernel is 3.11
1212
# 4. Run this script (as root!) to optimize the image for fast boot times
1313
# 5. Create a new AMI from the root volume
1414
# 6. Distribute the AMI to other regions using `ec2-copy-image`

contrib/ec2/prepare-node-ami.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# Instructions:
77
#
88
# 1. Launch a vanilla Ubuntu 12.04 instance (64-bit with an EBS root volume)
9-
# 2. SSH in and install the 3.8 kernel with:
10-
# apt-get update && apt-get install -yq linux-image-generic-lts-raring linux-headers-generic-lts-raring && reboot
11-
# 3. After reboot is complete, SSH in and `uname -r` to confirm kernel is 3.8
9+
# 2. SSH in and install the 3.11 kernel as root with:
10+
# apt-get update && apt-get install -yq linux-image-generic-lts-saucy linux-headers-generic-lts-saucy && reboot
11+
# 3. After reboot is complete, SSH in and `uname -r` to confirm kernel is 3.11
1212
# 4. Run this script (as root!) to optimize the image for fast boot times
1313
# 5. Create a new AMI from the root volume
1414
# 6. Distribute the AMI to other regions using `ec2-copy-image`

contrib/ec2/provision-ec2-controller.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,21 @@ region=$1
4545
# see contrib/prepare-ubuntu-ami.sh for instructions
4646
# on creating your own deis-optmized AMIs
4747
if [ "$region" == "ap-northeast-1" ]; then
48-
image=ami-5d432d5c
48+
image=ami-ed7503ec
4949
elif [ "$region" == "ap-southeast-1" ]; then
50-
image=ami-b4c493e6
50+
image=ami-76673624
5151
elif [ "$region" == "ap-southeast-2" ]; then
52-
image=ami-d59d03ef
52+
image=ami-7dbb2247
5353
elif [ "$region" == "eu-west-1" ]; then
54-
image=ami-ce30c5b9
54+
image=ami-bd31c3ca
5555
elif [ "$region" == "sa-east-1" ]; then
56-
image=ami-61b1117c
56+
image=ami-2964c734
5757
elif [ "$region" == "us-east-1" ]; then
58-
image=ami-8df9c9e4
58+
image=ami-f9080a90
5959
elif [ "$region" == "us-west-1" ]; then
60-
image=ami-62477527
60+
image=ami-148bb751
6161
elif [ "$region" == "us-west-2" ]; then
62-
image=ami-ac690a9c
62+
image=ami-f082eec0
6363
else
6464
echo "Cannot find AMI for region: $region"
6565
exit 1

contrib/rackspace/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Provision a Deis Controller on Rackspace
3232
1. Prepare a new server
3333
1. Create a server named `deis-prepare-image` using the Ubuntu 12.04 LTS image, performance1-2, 1GB performance server
3434
1. SSH in as root with the password shown
35-
1. Install the 3.8 kernel with: ```apt-get update && apt-get install -yq linux-image-generic-lts-raring linux-headers-generic-lts-raring && reboot```
36-
1. After reboot is complete, SSH back in as root and `uname -r` to confirm kernel is `3.8.0-35-generic`
35+
1. Install the 3.11 kernel with: ```apt-get update && apt-get install -yq linux-image-generic-lts-saucy linux-headers-generic-lts-saucy && reboot```
36+
1. After reboot is complete, SSH back in as root and `uname -r` to confirm kernel is `3.11.0-17-generic`
3737
1. Run the `prepare-controller-image.sh` script to optimize the image for fast boot times
3838

3939
```console

contrib/rackspace/prepare-controller-image.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#
88
# 1. Create a server using the Ubuntu 12.04 LTS image,
99
# performance1-2, 2GB performance server
10-
# 2. SSH in as root with the password shown, then install the 3.8 kernel with:
11-
# apt-get update && apt-get install -yq linux-image-generic-lts-raring linux-headers-generic-lts-raring && reboot
12-
# 3. After reboot is complete, SSH in and `uname -r` to confirm kernel is 3.8
10+
# 2. SSH in as root with the password shown, then install the 3.11 kernel with:
11+
# apt-get update && apt-get install -yq linux-image-generic-lts-saucy linux-headers-generic-lts-saucy && reboot
12+
# 3. After reboot is complete, SSH in and `uname -r` to confirm kernel is 3.11
1313
# 4. Run this script (as root) to optimize the image for fast boot times
1414
# 5. Create a new image from the server named "deis-node-image".
1515
# 6. Distribute the image to other regions

contrib/vagrant/prepare-ubuntu-box.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# Instructions:
88
#
99
# 1. Launch a vanilla Ubuntu 12.04 instance with `vagrant up`
10-
# 2. SSH in with `vagrant ssh`, do `sudo -i` and install the 3.8 kernel with:
11-
# apt-get update && apt-get install -yq linux-image-generic-lts-raring linux-headers-generic-lts-raring && reboot
10+
# 2. SSH in with `vagrant ssh`, do `sudo -i` and install the 3.11 kernel with:
11+
# apt-get update && apt-get install -yq linux-image-generic-lts-saucy linux-headers-generic-lts-saucy && reboot
1212
# 3. After reboot is complete, SSH in again and `uname -r` to confirm kernel is 3.8
1313
# 4. Run this script (as root!) to optimize the image for fast boot times
1414
# 5. Create a new box with `vagrant package && cp -f package.box contrib/vagrant/deis-base.box`

provider/ec2.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
# Deis-optimized EC2 amis -- with 3.8 kernel, chef 11 deps,
1818
# and large docker images (e.g. buildstep) pre-installed
1919
IMAGE_MAP = {
20-
'ap-northeast-1': 'ami-5d432d5c',
21-
'ap-southeast-1': 'ami-b4c493e6',
22-
'ap-southeast-2': 'ami-d59d03ef',
23-
'eu-west-1': 'ami-ce30c5b9',
24-
'sa-east-1': 'ami-61b1117c',
25-
'us-east-1': 'ami-8df9c9e4',
26-
'us-west-1': 'ami-62477527',
27-
'us-west-2': 'ami-ea6001da',
20+
'ap-northeast-1': 'ami-f37503f2',
21+
'ap-southeast-1': 'ami-7867362a',
22+
'ap-southeast-2': 'ami-71bb224b',
23+
'eu-west-1': 'ami-af31c3d8',
24+
'sa-east-1': 'ami-2b64c736',
25+
'us-east-1': 'ami-c1080aa8',
26+
'us-west-1': 'ami-1c8bb759',
27+
'us-west-2': 'ami-f282eec2',
2828
}
2929

3030

0 commit comments

Comments
 (0)