Skip to content

Commit 6302280

Browse files
committed
1 parent af10900 commit 6302280

6 files changed

Lines changed: 17 additions & 17 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 = ">= 681.0.0"
59+
config.vm.box_version = ">= 681.2.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-681.0.0',
39-
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-681.0.0]')
38+
parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-681.2.0',
39+
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-681.2.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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@
123123

124124
"Mappings" : {
125125
"CoreOSAMIs" : {
126-
"eu-central-1" : { "PV" : "ami-a491a8b9", "HVM" : "ami-aa91a8b7" },
127-
"ap-northeast-1" : { "PV" : "ami-a802dca8", "HVM" : "ami-aa02dcaa" },
128-
"us-gov-west-1" : { "PV" : "ami-bfbada9c", "HVM" : "ami-b9bada9a" },
129-
"sa-east-1" : { "PV" : "ami-e51797f8", "HVM" : "ami-eb1797f6" },
130-
"ap-southeast-2" : { "PV" : "ami-b513688f", "HVM" : "ami-ab136891" },
131-
"ap-southeast-1" : { "PV" : "ami-c0ffc592", "HVM" : "ami-c2ffc590" },
132-
"us-east-1" : { "PV" : "ami-7bad4710", "HVM" : "ami-79ad4712" },
133-
"us-west-2" : { "PV" : "ami-c7162ef7", "HVM" : "ami-c5162ef5" },
134-
"us-west-1" : { "PV" : "ami-f33cd6b7", "HVM" : "ami-f13cd6b5" },
135-
"eu-west-1" : { "PV" : "ami-05fd8272", "HVM" : "ami-07fd8270" }
126+
"eu-central-1" : { "PV" : "ami-e8e5ddf5", "HVM" : "ami-eae5ddf7" },
127+
"ap-northeast-1" : { "PV" : "ami-1c6fca1c", "HVM" : "ami-1a6fca1a" },
128+
"us-gov-west-1" : { "PV" : "ami-ef9fffcc", "HVM" : "ami-e99fffca" },
129+
"sa-east-1" : { "PV" : "ami-b3cb49ae", "HVM" : "ami-b1cb49ac" },
130+
"ap-southeast-2" : { "PV" : "ami-2d641e17", "HVM" : "ami-23641e19" },
131+
"ap-southeast-1" : { "PV" : "ami-d803078a", "HVM" : "ami-da030788" },
132+
"us-east-1" : { "PV" : "ami-91ea17fa", "HVM" : "ami-93ea17f8" },
133+
"us-west-2" : { "PV" : "ami-5f4d486f", "HVM" : "ami-5d4d486d" },
134+
"us-west-1" : { "PV" : "ami-cb67938f", "HVM" : "ami-c967938d" },
135+
"eu-west-1" : { "PV" : "ami-512f5526", "HVM" : "ami-5f2f5528" }
136136

137137
},
138138
"RootDevices" : {

contrib/rackspace/provision-rackspace-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +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 633.1.0 in the stable channel
52-
# TODO: Update to 681.0.0 when it's available in the stable channel
52+
# TODO: Update to 681.2.0 when it's available in the stable channel
5353
supernova $ENV boot --image a41d8b7c-d41b-4369-a180-0734f3b1cd8c --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 ; \
5454
((i = i + 1)) ; \
5555
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, ``681.0.0``. To specify a CoreOS
108-
version, append the ``-V`` parameter to the install command, e.g. ``-V 681.0.0``.
107+
platforms typically specify a CoreOS version - currently, ``681.2.0``. To specify a CoreOS
108+
version, append the ``-V`` parameter to the install command, e.g. ``-V 681.2.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-681-0-0-v20150609 \
121+
--image coreos-stable-681-2-0-v20150618 \
122122
--image-project coreos-cloud;
123123
done
124124

0 commit comments

Comments
 (0)