Merge pull request deis#4438 from mboersma/coreos-stable-again

chore(*): update CoreOS to 766.3.0
gluegl · Sep 10, 2015 · 43f0833 · 43f0833
2 parents 04a9306 + f6ad2a0
commit 43f0833
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -55,25 +55,12 @@ Vagrant.configure("2") do |config|
   # always use Vagrant's insecure key
   config.ssh.insert_key = false
   config.vm.box = "coreos-%s" % $update_channel
-
-  # HACK to bypass the limitation of the CoreOS "current" metadata for boxes -
-  # it only specifies the latest release, so we cannot use it for older releases.
-  # TODO(carmstrong) we can remove this once we're back to using "specific release or more recent"
-  if $update_channel == "stable"
-    config.vm.box_version = "= 647.2.0"
-    config.vm.box_url = "http://stable.release.core-os.net/amd64-usr/647.2.0/coreos_production_vagrant.json"
-  else
-    config.vm.box_version = ">= 681.2.0"
-    config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
-  end
+  config.vm.box_version = ">= 766.3.0"
+  config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
 
   ["vmware_fusion", "vmware_workstation"].each do |vmware|
     config.vm.provider vmware do |v, override|
-      if $update_channel == "stable"
-        override.vm.box_url = "http://stable.release.core-os.net/amd64-usr/647.2.0/coreos_production_vagrant_vmware_fusion.json" % $update_channel
-      else
-        override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
-      end
+      override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
     end
   end
 

diff --git a/contrib/azure/azure-coreos-cluster b/contrib/azure/azure-coreos-cluster
@@ -35,8 +35,8 @@ parser.add_argument('--affinity-group', default='',
                    help='optional, overrides location if specified')
 parser.add_argument('--ssh', default=22001, type=int,
                    help='optional, starts with 22001 and +1 for each machine in cluster')
-parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-647.2.0',
-                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-647.2.0]')
+parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-766.3.0',
+                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-766.3.0]')
 parser.add_argument('--num-nodes', default=3, type=int,
                    help='optional, number of nodes to create (or add), defaults to 3')
 parser.add_argument('--virtual-network-name',

diff --git a/contrib/linode/provision-linode-cluster.py b/contrib/linode/provision-linode-cluster.py
@@ -413,7 +413,7 @@ def run(self):
                                   help='Node data center id. Use list-data-centers to find the id.')
     provision_parser.add_argument('--cloud-config', required=False, default='linode-user-data.yaml', type=file, dest='cloud_config',
                                   help='CoreOS cloud config user-data file')
-    provision_parser.add_argument('--coreos-version', required=False, default='647.2.0', dest='coreos_version',
+    provision_parser.add_argument('--coreos-version', required=False, default='766.3.0', dest='coreos_version',
                                   help='CoreOS version number to install')
     provision_parser.add_argument('--coreos-channel', required=False, default='stable', dest='coreos_channel',
                                   help='CoreOS channel to install from')

diff --git a/contrib/utils.sh b/contrib/utils.sh
@@ -13,4 +13,4 @@ function echo_green {
 }
 
 COREOS_CHANNEL=${COREOS_CHANNEL:-stable}
-COREOS_VERSION=${COREOS_VERSION:-647.2.0}
+COREOS_VERSION=${COREOS_VERSION:-766.3.0}
diff --git a/docs/installing_deis/baremetal.rst b/docs/installing_deis/baremetal.rst
@@ -94,7 +94,7 @@ Start the installation
 
 .. code-block:: console
 
-    coreos-install -C stable -c /tmp/config -d /dev/sda -V 647.2.0
+    coreos-install -C stable -c /tmp/config -d /dev/sda -V 766.3.0
 
 
 This will install the latest `CoreOS`_ stable release that has been known to work

diff --git a/docs/installing_deis/gce.rst b/docs/installing_deis/gce.rst
@@ -118,7 +118,7 @@ Launch 3 instances. You can choose another starting CoreOS image from the listin
       --metadata-from-file user-data=gce-user-data,sshKeys=$HOME/.ssh/deis.pub \
       --disk name=cored${num},device-name=coredocker \
       --tags deis \
-      --image coreos-stable-647-2-0-v20150528 \
+      --image coreos-stable-766-3-0-v20150908 \
       --image-project coreos-cloud;
     done