Merge pull request #1064 from deis/coreos-324.2.0

chore(contrib/*): update to CoreOS 324.2.0

Author: mboersma

Vagrantfile

@@ -12,11 +12,11 @@ else
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "coreos-324.1.0"
-  config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/324.1.0/coreos_production_vagrant.box"
+  config.vm.box = "coreos-324.2.0"
+  config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/324.2.0/coreos_production_vagrant.box"
 
   config.vm.provider :vmware_fusion do |vb, override|
-    override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/324.1.0/coreos_production_vagrant_vmware_fusion.box"
+    override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/324.2.0/coreos_production_vagrant_vmware_fusion.box"
   end
 
   config.vm.provider :virtualbox do |vb, override|

contrib/ec2/deis.template

@@ -4,28 +4,28 @@
   "Mappings" : {
       "RegionMap" : {
           "ap-northeast-1" : {
-              "AMI" : "ami-836c2f82"
+              "AMI" : "ami-25175a24"
           },
           "sa-east-1" : {
-              "AMI" : "ami-43ab075e"
+              "AMI" : "ami-b96fc3a4"
           },
           "ap-southeast-2" : {
-              "AMI" : "ami-4ba53f71"
+              "AMI" : "ami-792ab043"
           },
           "ap-southeast-1" : {
-              "AMI" : "ami-946d30c6"
+              "AMI" : "ami-58c9940a"
           },
           "us-east-1" : {
-              "AMI" : "ami-3221c95a"
+              "AMI" : "ami-8a53a6e2"
           },
           "us-west-2" : {
-              "AMI" : "ami-a1c6b791"
+              "AMI" : "ami-a7d1a197"
           },
           "us-west-1" : {
-              "AMI" : "ami-3c080d79"
+              "AMI" : "ami-debdb89b"
           },
           "eu-west-1" : {
-              "AMI" : "ami-3f7ab948"
+              "AMI" : "ami-1df4396a"
           }
       }
   },

contrib/rackspace/README.md

@@ -53,16 +53,6 @@ For more information, see [optimal etcd cluster size](https://github.com/coreos/
 
 Deis clusters of less than 3 nodes are unsupported.
 
-### Update CoreOS
-Due to image publishing limitations on Rackspace, CoreOS images on Rackspace are frequently out of date.
-Each machine needs to be updated. On each one, run:
-
-```console
-$ sudo systemctl unmask update-engine && sudo systemctl start update-engine && sudo update_engine_client -update && sudo reboot
-```
-
-Once the machine is rebooted, it should have a recent CoreOS version.
-
 ### Initialize the cluster
 Once the cluster is up, get the hostname of any of the machines from Rackspace, set
 FLEETCTL_TUNNEL, and issue a `make run` from the project root:

contrib/rackspace/provision-rackspace-cluster.sh

@@ -39,10 +39,9 @@ fi
 
 i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
     echo_yellow "Provisioning deis-$i..."
-    supernova production boot --image 70210a69-081e-4a5e-b402-3cdbabfdcddd --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
+    supernova production boot --image 24614284-19a9-4348-bee3-a504d7094d1b --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
     ((i = i + 1)) ; \
 done
 
 echo_green "Your Deis cluster has successfully deployed to Rackspace."
 echo_green "Please continue to follow the instructions in the README."
-echo_yellow "NOTE: For this release, you must also update CoreOS on these machines. See the README for details."