Skip to content

Commit 46f9fdc

Browse files
committed
chore(*): bump CoreOS to 647.0.0
1 parent 4f54269 commit 46f9fdc

6 files changed

Lines changed: 18 additions & 16 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 = ">= 633.1.0"
59+
config.vm.box_version = ">= 647.0.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: 3 additions & 3 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-633.1.0',
39-
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-633.1.0]')
38+
parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-647.0.0',
39+
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-647.0.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',
@@ -163,7 +163,7 @@ def network_config(subnet_name=None, port='59913', public_ip_name=None):
163163
if not args.nohttps:
164164
network.input_endpoints.input_endpoints.append(lb_endpoint_config('https', '443', load_balancer_probe(None, '443', 'tcp')))
165165
# create builder endpoint TCP probe check and extended timeout
166-
network.input_endpoints.input_endpoints.append(lb_endpoint_config('builder', '2222',
166+
network.input_endpoints.input_endpoints.append(lb_endpoint_config('builder', '2222',
167167
load_balancer_probe(None, '2222', 'tcp',), 20))
168168
return network
169169

contrib/ec2/deis.template.json

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

109109
"Mappings" : {
110110
"CoreOSAMIs" : {
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" }
111+
"eu-central-1" : { "PV" : "ami-3c764821", "HVM" : "ami-38764825" },
112+
"ap-northeast-1" : { "PV" : "ami-9022eb90", "HVM" : "ami-8e22eb8e" },
113+
"us-gov-west-1" : { "PV" : "ami-cf0868ec", "HVM" : "ami-c90868ea" },
114+
"sa-east-1" : { "PV" : "ami-1113940c", "HVM" : "ami-1313940e" },
115+
"ap-southeast-2" : { "PV" : "ami-6d83fc57", "HVM" : "ami-6383fc59" },
116+
"ap-southeast-1" : { "PV" : "ami-8a546ad8", "HVM" : "ami-84546ad6" },
117+
"us-east-1" : { "PV" : "ami-e8657580", "HVM" : "ami-ea657582" },
118+
"us-west-2" : { "PV" : "ami-67427157", "HVM" : "ami-65427155" },
119+
"us-west-1" : { "PV" : "ami-75dd3331", "HVM" : "ami-77dd3333" },
120+
"eu-west-1" : { "PV" : "ami-4d1c763a", "HVM" : "ami-4b1c763c" }
120121

121122
},
122123
"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 633.1.0 in the stable channel
52+
# TODO: Update to 647.0.0 when it's available in the stable channel
5253
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 ; \
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, ``633.1.0``. To specify a CoreOS
108-
version, append the ``-V`` parameter to the install command, e.g. ``-V 633.1.0``.
107+
platforms typically specify a CoreOS version - currently, ``647.0.0``. To specify a CoreOS
108+
version, append the ``-V`` parameter to the install command, e.g. ``-V 647.0.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-633-1-0-v20150414 \
121+
--image coreos-stable-647-0-0-v20150512 \
122122
--image-project coreos-cloud;
123123
done
124124

0 commit comments

Comments
 (0)