Merge pull request #3894 from mboersma/update-coreos-stable

chore(*): bump CoreOS to 681.2.0
deis · Jun 24, 2015 · 8b60afb · 8b60afb
2 parents 00e47e6 + 6302280
commit 8b60afb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -56,7 +56,7 @@ Vagrant.configure("2") do |config|
   config.ssh.insert_key = false
 
   config.vm.box = "coreos-%s" % $update_channel
-  config.vm.box_version = ">= 681.0.0"
+  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
 
   ["vmware_fusion", "vmware_workstation"].each do |vmware|

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-681.0.0',
-                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-681.0.0]')
+parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-681.2.0',
+                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-681.2.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/ec2/deis.template.json b/contrib/ec2/deis.template.json
@@ -123,16 +123,16 @@
 
   "Mappings" : {
     "CoreOSAMIs" : {
-      "eu-central-1"   : { "PV" : "ami-a491a8b9", "HVM" : "ami-aa91a8b7" },
-      "ap-northeast-1" : { "PV" : "ami-a802dca8", "HVM" : "ami-aa02dcaa" },
-      "us-gov-west-1"  : { "PV" : "ami-bfbada9c", "HVM" : "ami-b9bada9a" },
-      "sa-east-1"      : { "PV" : "ami-e51797f8", "HVM" : "ami-eb1797f6" },
-      "ap-southeast-2" : { "PV" : "ami-b513688f", "HVM" : "ami-ab136891" },
-      "ap-southeast-1" : { "PV" : "ami-c0ffc592", "HVM" : "ami-c2ffc590" },
-      "us-east-1"      : { "PV" : "ami-7bad4710", "HVM" : "ami-79ad4712" },
-      "us-west-2"      : { "PV" : "ami-c7162ef7", "HVM" : "ami-c5162ef5" },
-      "us-west-1"      : { "PV" : "ami-f33cd6b7", "HVM" : "ami-f13cd6b5" },
-      "eu-west-1"      : { "PV" : "ami-05fd8272", "HVM" : "ami-07fd8270" }
+      "eu-central-1"   : { "PV" : "ami-e8e5ddf5", "HVM" : "ami-eae5ddf7" },
+      "ap-northeast-1" : { "PV" : "ami-1c6fca1c", "HVM" : "ami-1a6fca1a" },
+      "us-gov-west-1"  : { "PV" : "ami-ef9fffcc", "HVM" : "ami-e99fffca" },
+      "sa-east-1"      : { "PV" : "ami-b3cb49ae", "HVM" : "ami-b1cb49ac" },
+      "ap-southeast-2" : { "PV" : "ami-2d641e17", "HVM" : "ami-23641e19" },
+      "ap-southeast-1" : { "PV" : "ami-d803078a", "HVM" : "ami-da030788" },
+      "us-east-1"      : { "PV" : "ami-91ea17fa", "HVM" : "ami-93ea17f8" },
+      "us-west-2"      : { "PV" : "ami-5f4d486f", "HVM" : "ami-5d4d486d" },
+      "us-west-1"      : { "PV" : "ami-cb67938f", "HVM" : "ami-c967938d" },
+      "eu-west-1"      : { "PV" : "ami-512f5526", "HVM" : "ami-5f2f5528" }
 
     },
     "RootDevices" : {

diff --git a/contrib/rackspace/provision-rackspace-cluster.sh b/contrib/rackspace/provision-rackspace-cluster.sh
@@ -49,7 +49,7 @@ $CONTRIB_DIR/util/check-user-data.sh
 i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
     echo_yellow "Provisioning deis-$i..."
     # This image is CoreOS 633.1.0 in the stable channel
-    # TODO: Update to 681.0.0 when it's available in the stable channel
+    # TODO: Update to 681.2.0 when it's available in the stable channel
     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 ; \
     ((i = i + 1)) ; \
 done

diff --git a/docs/installing_deis/baremetal.rst b/docs/installing_deis/baremetal.rst
@@ -104,8 +104,8 @@ Start the installation
 
 
 This will install the latest `CoreOS`_ stable release to disk. The Deis provision scripts for other
-platforms typically specify a CoreOS version - currently, ``681.0.0``. To specify a CoreOS
-version, append the ``-V`` parameter to the install command, e.g. ``-V 681.0.0``.
+platforms typically specify a CoreOS version - currently, ``681.2.0``. To specify a CoreOS
+version, append the ``-V`` parameter to the install command, e.g. ``-V 681.2.0``.
 
 After the installation has finished, reboot your server. Once your machine is back up, you should
 be able to log in as the `core` user using the `deis` ssh key.

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=~/.ssh/deis.pub \
       --disk name=cored${num} device-name=coredocker \
       --tags deis \
-      --image coreos-stable-681-0-0-v20150609 \
+      --image coreos-stable-681-2-0-v20150618 \
       --image-project coreos-cloud;
     done