Skip to content

Commit 43f0833

Browse files
committed
Merge pull request #4438 from mboersma/coreos-stable-again
chore(*): update CoreOS to 766.3.0
2 parents 04a9306 + f6ad2a0 commit 43f0833

6 files changed

Lines changed: 9 additions & 22 deletions

File tree

Vagrantfile

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,12 @@ Vagrant.configure("2") do |config|
5555
# always use Vagrant's insecure key
5656
config.ssh.insert_key = false
5757
config.vm.box = "coreos-%s" % $update_channel
58-
59-
# HACK to bypass the limitation of the CoreOS "current" metadata for boxes -
60-
# it only specifies the latest release, so we cannot use it for older releases.
61-
# TODO(carmstrong) we can remove this once we're back to using "specific release or more recent"
62-
if $update_channel == "stable"
63-
config.vm.box_version = "= 647.2.0"
64-
config.vm.box_url = "http://stable.release.core-os.net/amd64-usr/647.2.0/coreos_production_vagrant.json"
65-
else
66-
config.vm.box_version = ">= 681.2.0"
67-
config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
68-
end
58+
config.vm.box_version = ">= 766.3.0"
59+
config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
6960

7061
["vmware_fusion", "vmware_workstation"].each do |vmware|
7162
config.vm.provider vmware do |v, override|
72-
if $update_channel == "stable"
73-
override.vm.box_url = "http://stable.release.core-os.net/amd64-usr/647.2.0/coreos_production_vagrant_vmware_fusion.json" % $update_channel
74-
else
75-
override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
76-
end
63+
override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
7764
end
7865
end
7966

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-647.2.0',
39-
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-647.2.0]')
38+
parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-766.3.0',
39+
help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-766.3.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/linode/provision-linode-cluster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ def run(self):
413413
help='Node data center id. Use list-data-centers to find the id.')
414414
provision_parser.add_argument('--cloud-config', required=False, default='linode-user-data.yaml', type=file, dest='cloud_config',
415415
help='CoreOS cloud config user-data file')
416-
provision_parser.add_argument('--coreos-version', required=False, default='647.2.0', dest='coreos_version',
416+
provision_parser.add_argument('--coreos-version', required=False, default='766.3.0', dest='coreos_version',
417417
help='CoreOS version number to install')
418418
provision_parser.add_argument('--coreos-channel', required=False, default='stable', dest='coreos_channel',
419419
help='CoreOS channel to install from')

contrib/utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ function echo_green {
1313
}
1414

1515
COREOS_CHANNEL=${COREOS_CHANNEL:-stable}
16-
COREOS_VERSION=${COREOS_VERSION:-647.2.0}
16+
COREOS_VERSION=${COREOS_VERSION:-766.3.0}

docs/installing_deis/baremetal.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Start the installation
9494

9595
.. code-block:: console
9696
97-
coreos-install -C stable -c /tmp/config -d /dev/sda -V 647.2.0
97+
coreos-install -C stable -c /tmp/config -d /dev/sda -V 766.3.0
9898
9999
100100
This will install the latest `CoreOS`_ stable release that has been known to work

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=$HOME/.ssh/deis.pub \
119119
--disk name=cored${num},device-name=coredocker \
120120
--tags deis \
121-
--image coreos-stable-647-2-0-v20150528 \
121+
--image coreos-stable-766-3-0-v20150908 \
122122
--image-project coreos-cloud;
123123
done
124124

0 commit comments

Comments
 (0)