Skip to content

Commit 51d09e3

Browse files
committed
Merge pull request #2432 from mboersma/coreos-494
chore(*): update CoreOS to 494.0.0
2 parents 9011893 + 0fd83c1 commit 51d09e3

5 files changed

Lines changed: 13 additions & 12 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 = "490.0.0"
38+
COREOS_VERSION = "494.0.0"
3939

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

contrib/ec2/deis.template.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@
8484

8585
"Mappings" : {
8686
"CoreOSAMIs" : {
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" }
87+
"eu-central-1" : { "PV" : "ami-0cae9811", "HVM" : "ami-12ae980f" },
88+
"ap-northeast-1" : { "PV" : "ami-9f60599e", "HVM" : "ami-9d60599c" },
89+
"sa-east-1" : { "PV" : "ami-21ca7c3c", "HVM" : "ami-23ca7c3e" },
90+
"ap-southeast-2" : { "PV" : "ami-adb9d697", "HVM" : "ami-afb9d695" },
91+
"ap-southeast-1" : { "PV" : "ami-0eebc85c", "HVM" : "ami-0cebc85e" },
92+
"us-east-1" : { "PV" : "ami-30058d58", "HVM" : "ami-3e058d56" },
93+
"us-west-2" : { "PV" : "ami-b34f0483", "HVM" : "ami-b14f0481" },
94+
"us-west-1" : { "PV" : "ami-ff7264ba", "HVM" : "ami-f97264bc" },
95+
"eu-west-1" : { "PV" : "ami-1e47f269", "HVM" : "ami-1c47f26b" }
9696

9797
},
9898
"RootDevices" : {

contrib/rackspace/provision-rackspace-cluster.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ $CONTRIB_DIR/util/check-user-data.sh
4848

4949
i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
5050
echo_yellow "Provisioning deis-$i..."
51+
# TODO: update to CoreOS 494.0.0 when it is available at Rackspace
5152
# This image is CoreOS 490.0.0
5253
supernova $ENV boot --image 3c7e97fa-a9f5-4b09-97aa-c94e66dbbfeb --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
5354
((i = i + 1)) ; \

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 490.0.0``.
105+
append the ``-V`` parameter to the install command, e.g. ``-V 494.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: 1 addition & 1 deletion
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-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
120+
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-alpha-494-0-0-v20141108 --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

0 commit comments

Comments
 (0)