Skip to content

Commit cf4cf9f

Browse files
committed
Merge pull request #2387 from carmstrong/coreos_490.0.0
chore(*): bump CoreOS to 490.0.0
2 parents fdda24a + 38185c3 commit cf4cf9f

5 files changed

Lines changed: 17 additions & 14 deletions

File tree

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ else
3535
$vb_cpus = 1
3636
end
3737

38-
COREOS_VERSION = "472.0.0"
38+
COREOS_VERSION = "490.0.0"
3939

4040
if File.exist?(CONFIG)
4141
require CONFIG

contrib/ec2/deis.template.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,16 @@
8484

8585
"Mappings" : {
8686
"CoreOSAMIs" : {
87-
"us-east-1" : { "PV" : "ami-52db613a", "HVM" : "ami-50db6138" },
88-
"us-west-2" : { "PV" : "ami-77410e47", "HVM" : "ami-75410e45" },
89-
"us-west-1" : { "PV" : "ami-810411c4", "HVM" : "ami-830411c6" },
90-
"eu-west-1" : { "PV" : "ami-7eb91609", "HVM" : "ami-7cb9160b" },
91-
"ap-southeast-1" : { "PV" : "ami-ec5071be", "HVM" : "ami-925071c0" },
92-
"ap-southeast-2" : { "PV" : "ami-07b0dd3d", "HVM" : "ami-05b0dd3f" },
93-
"ap-northeast-1" : { "PV" : "ami-c73504c6", "HVM" : "ami-c93504c8" },
94-
"sa-east-1" : { "PV" : "ami-6b8d3976", "HVM" : "ami-698d3974" }
87+
"eu-central-1" : { "PV" : "ami-54ccfa49", "HVM" : "ami-56ccfa4b" },
88+
"ap-northeast-1" : { "PV" : "ami-f7b08ff6", "HVM" : "ami-f9b08ff8" },
89+
"sa-east-1" : { "PV" : "ami-1304b30e", "HVM" : "ami-1104b30c" },
90+
"ap-southeast-2" : { "PV" : "ami-0f117e35", "HVM" : "ami-09117e33" },
91+
"ap-southeast-1" : { "PV" : "ami-c04f6c92", "HVM" : "ami-c24f6c90" },
92+
"us-east-1" : { "PV" : "ami-7ae66812", "HVM" : "ami-66e6680e" },
93+
"us-west-2" : { "PV" : "ami-e18dc5d1", "HVM" : "ami-ff8dc5cf" },
94+
"us-west-1" : { "PV" : "ami-45fbec00", "HVM" : "ami-bbfcebfe" },
95+
"eu-west-1" : { "PV" : "ami-a27fd5d5", "HVM" : "ami-a47fd5d3" }
96+
9597
},
9698
"RootDevices" : {
9799
"HVM" : { "Name": "/dev/xvda" },

contrib/rackspace/provision-rackspace-cluster.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ $CONTRIB_DIR/util/check-user-data.sh
4242

4343
i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
4444
echo_yellow "Provisioning deis-$i..."
45-
# this image is CoreOS 452.0.0
46-
supernova production boot --image 7f116bdd-9b17-410c-b049-eb1bca1b7087 --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
45+
# This image is CoreOS 459.0.0, the most recent provided by Rackspace
46+
# Deis requires at least CoreOS 471.1.0
47+
supernova production boot --image 325a1c78-78e1-4367-be7a-1334b088018a --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
4748
((i = i + 1)) ; \
4849
done
4950

docs/installing_deis/baremetal.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Start the installation
102102
103103
104104
This will install the latest `CoreOS`_ alpha release to disk. To specify a specific CoreOS version,
105-
append the ``-V`` parameter to the install command, e.g. ``-V 472.0.0``.
105+
append the ``-V`` parameter to the install command, e.g. ``-V 490.0.0``.
106106

107107
After the installation has finished, reboot your server. Once your machine is back up, you should
108108
be able to log in as the `core` user using the `deis` ssh key.

docs/installing_deis/gce.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Launch 3 instances. You can choose another starting CoreOS image from the listin
117117

118118
.. code-block:: console
119119
120-
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-alpha-472-0-0-v20141017 --persistent_boot_disk --zone us-central1-a --machine_type n1-standard-2 --tags deis --metadata_from_file user-data:gce-user-data --disk cored${num},deviceName=coredocker --authorized_ssh_keys=core:~/.ssh/deis.pub,core:~/.ssh/google_compute_engine.pub core${num}; done
120+
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-alpha-490-0-0-v20141104 --persistent_boot_disk --zone us-central1-a --machine_type n1-standard-2 --tags deis --metadata_from_file user-data:gce-user-data --disk cored${num},deviceName=coredocker --authorized_ssh_keys=core:~/.ssh/deis.pub,core:~/.ssh/google_compute_engine.pub core${num}; done
121121
122122
Table of resources:
123123
@@ -278,4 +278,4 @@ It works! Enjoy your Deis cluster in Google Compute Engine!
278278

279279

280280
.. _`Google Cloud SDK`: https://developers.google.com/compute/docs/gcutil/#install
281-
.. _`Google Developer Console`: https://console.developers.google.com/project
281+
.. _`Google Developer Console`: https://console.developers.google.com/project

0 commit comments

Comments
 (0)