Skip to content

Commit 0a8c9e3

Browse files
committed
Merge pull request #3492 from carmstrong/coreos-633.1.0
chore(*): bump CoreOS to 633.1.0
2 parents 02b78a2 + 4e3abb2 commit 0a8c9e3

6 files changed

Lines changed: 16 additions & 15 deletions

File tree

Vagrantfile

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

5858
config.vm.box = "coreos-%s" % $update_channel
59-
config.vm.box_version = ">= 607.0.0"
59+
config.vm.box_version = ">= 633.1.0"
6060
config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
6161

6262
["vmware_fusion", "vmware_workstation"].each do |vmware|

contrib/azure/azure-coreos-cluster

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ parser.add_argument('--affinity-group', default='',
3535
help='optional, overrides location if specified')
3636
parser.add_argument('--ssh', default=22001, type=int,
3737
help='optional, starts with 22001 and +1 for each machine in cluster')
38-
parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-607.0.0',
39-
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-607.0.0]')
38+
parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-633.1.0',
39+
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-633.1.0]')
4040
parser.add_argument('--num-nodes', default=3, type=int,
4141
help='optional, number of nodes to create (or add), defaults to 3')
4242
parser.add_argument('--virtual-network-name',

contrib/ec2/deis.template.json

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

109109
"Mappings" : {
110110
"CoreOSAMIs" : {
111-
"eu-central-1" : { "PV" : "ami-0c300d11", "HVM" : "ami-0e300d13" },
112-
"ap-northeast-1" : { "PV" : "ami-b128dcb1", "HVM" : "ami-af28dcaf" },
113-
"sa-east-1" : { "PV" : "ami-2154ec3c", "HVM" : "ami-2354ec3e" },
114-
"ap-southeast-2" : { "PV" : "ami-bbb5c581", "HVM" : "ami-b9b5c583" },
115-
"ap-southeast-1" : { "PV" : "ami-fa0b3aa8", "HVM" : "ami-f80b3aaa" },
116-
"us-east-1" : { "PV" : "ami-343b195c", "HVM" : "ami-323b195a" },
117-
"us-west-2" : { "PV" : "ami-0989a439", "HVM" : "ami-0789a437" },
118-
"us-west-1" : { "PV" : "ami-83d533c7", "HVM" : "ami-8dd533c9" },
119-
"eu-west-1" : { "PV" : "ami-57950a20", "HVM" : "ami-55950a22" }
111+
"eu-central-1" : { "PV" : "ami-8c003c91", "HVM" : "ami-92003c8f" },
112+
"ap-northeast-1" : { "PV" : "ami-9eb9439e", "HVM" : "ami-9cb9439c" },
113+
"sa-east-1" : { "PV" : "ami-9be66386", "HVM" : "ami-99e66384" },
114+
"ap-southeast-2" : { "PV" : "ami-d53845ef", "HVM" : "ami-cb3845f1" },
115+
"ap-southeast-1" : { "PV" : "ami-a2cefcf0", "HVM" : "ami-a0cefcf2" },
116+
"us-east-1" : { "PV" : "ami-d6033bbe", "HVM" : "ami-d2033bba" },
117+
"us-west-2" : { "PV" : "ami-39280209", "HVM" : "ami-37280207" },
118+
"us-west-1" : { "PV" : "ami-4df91b09", "HVM" : "ami-43f91b07" },
119+
"eu-west-1" : { "PV" : "ami-2f422358", "HVM" : "ami-21422356" }
120120

121121
},
122122
"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 607.0.0 in the stable channel
52+
# TODO Update to 633.1.0 once it's available in the stable channel
5253
supernova $ENV boot --image c412af3b-f9a6-4ad1-a9e9-4aabca8073d3 --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
@@ -104,8 +104,8 @@ Start the installation
104104
105105
106106
This will install the latest `CoreOS`_ stable release to disk. The Deis provision scripts for other
107-
platforms typically specify a CoreOS version - currently, ``607.0.0``. To specify a CoreOS
108-
version, append the ``-V`` parameter to the install command, e.g. ``-V 607.0.0``.
107+
platforms typically specify a CoreOS version - currently, ``633.1.0``. To specify a CoreOS
108+
version, append the ``-V`` parameter to the install command, e.g. ``-V 633.1.0``.
109109

110110
After the installation has finished, reboot your server. Once your machine is back up, you should
111111
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
@@ -118,7 +118,7 @@ Launch 3 instances. You can choose another starting CoreOS image from the listin
118118
--metadata-from-file user-data=gce-user-data sshKeys=~/.ssh/deis.pub \
119119
--disk name=cored${num} device-name=coredocker \
120120
--tags deis \
121-
--image coreos-stable-607-0-0-v20150317 \
121+
--image coreos-stable-633-1-0-v20150414 \
122122
--image-project coreos-cloud;
123123
done
124124

0 commit comments

Comments
 (0)