Skip to content

Commit 2ec433f

Browse files
committed
Merge pull request #2985 from carmstrong/coreos-522.6.0
chore(*): bump CoreOS to 522.6.0
2 parents 6cd009b + e4fc01c commit 2ec433f

5 files changed

Lines changed: 14 additions & 13 deletions

File tree

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Vagrant.configure("2") do |config|
3939
config.ssh.insert_key = false
4040

4141
config.vm.box = "coreos-%s" % $update_channel
42-
config.vm.box_version = ">= 522.5.0"
42+
config.vm.box_version = ">= 522.6.0"
4343
config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
4444

4545
config.vm.provider :vmware_fusion do |vb, override|

contrib/ec2/deis.template.json

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

9090
"Mappings" : {
9191
"CoreOSAMIs" : {
92-
"eu-central-1" : { "PV" : "ami-448dbd59", "HVM" : "ami-468dbd5b" },
93-
"ap-northeast-1" : { "PV" : "ami-0a05160b", "HVM" : "ami-0c05160d" },
94-
"sa-east-1" : { "PV" : "ami-27b00d3a", "HVM" : "ami-23b00d3e" },
95-
"ap-southeast-2" : { "PV" : "ami-b5295c8f", "HVM" : "ami-b7295c8d" },
96-
"ap-southeast-1" : { "PV" : "ami-ba0f27e8", "HVM" : "ami-b40f27e6" },
97-
"us-east-1" : { "PV" : "ami-3e750856", "HVM" : "ami-3c750854" },
98-
"us-west-2" : { "PV" : "ami-bf2d728f", "HVM" : "ami-bd2d728d" },
99-
"us-west-1" : { "PV" : "ami-8f534dca", "HVM" : "ami-8d534dc8" },
100-
"eu-west-1" : { "PV" : "ami-e76dec90", "HVM" : "ami-f96dec8e" }
92+
"eu-central-1" : { "PV" : "ami-38093a25", "HVM" : "ami-3a093a27" },
93+
"ap-northeast-1" : { "PV" : "ami-e2465fe3", "HVM" : "ami-e4465fe5" },
94+
"sa-east-1" : { "PV" : "ami-7f863a62", "HVM" : "ami-7d863a60" },
95+
"ap-southeast-2" : { "PV" : "ami-db7d09e1", "HVM" : "ami-d97d09e3" },
96+
"ap-southeast-1" : { "PV" : "ami-3e8da66c", "HVM" : "ami-3c8da66e" },
97+
"us-east-1" : { "PV" : "ami-3615525e", "HVM" : "ami-3415525c" },
98+
"us-west-2" : { "PV" : "ami-51134b61", "HVM" : "ami-6f134b5f" },
99+
"us-west-1" : { "PV" : "ami-bebfa6fb", "HVM" : "ami-bcbfa6f9" },
100+
"eu-west-1" : { "PV" : "ami-7bf27e0c", "HVM" : "ami-79f27e0e" }
101101

102102
},
103103
"RootDevices" : {

contrib/rackspace/provision-rackspace-cluster.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ $CONTRIB_DIR/util/check-user-data.sh
4949
i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
5050
echo_yellow "Provisioning deis-$i..."
5151
# This image is CoreOS 522.5.0 in the stable channel
52+
# TODO update to 522.6.0 once it's available in the stable channel
5253
supernova $ENV boot --image 4261011b-d98b-418b-80a1-9d2e687c9108 --flavor $FLAVOR --key-name $1 --user-data $CONTRIB_DIR/coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
5354
((i = i + 1)) ; \
5455
done

docs/installing_deis/baremetal.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ Start the installation
9999
100100
101101
This will install the latest `CoreOS`_ stable release to disk. The Deis provision scripts for other
102-
platforms typically specify a CoreOS version - currently, ``522.5.0``. To specify a CoreOS
103-
version, append the ``-V`` parameter to the install command, e.g. ``-V 522.5.0``.
102+
platforms typically specify a CoreOS version - currently, ``522.6.0``. To specify a CoreOS
103+
version, append the ``-V`` parameter to the install command, e.g. ``-V 522.6.0``.
104104

105105
After the installation has finished, reboot your server. Once your machine is back up, you should
106106
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
@@ -119,7 +119,7 @@ Launch 3 instances. You can choose another starting CoreOS image from the listin
119119

120120
.. code-block:: console
121121
122-
$ for num in 1 2 3; do gcutil addinstance --use_compute_key --image projects/coreos-cloud/global/images/coreos-stable-522-5-0-v20150114 --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
122+
$ for num in 1 2 3; do gcutil addinstance --use_compute_key --image projects/coreos-cloud/global/images/coreos-stable-522-6-0-v20150128 --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
123123
124124
Table of resources:
125125

0 commit comments

Comments
 (0)