Merge pull request #1541 from deis/coreos_402.2.0

chore(*): update CoreOS to 402.2.0; Docker to 1.1.2

Author: carmstrong

README.md

@@ -20,7 +20,7 @@ Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io
 ## Install prerequisites
 On your workstation:
 * Install [Vagrant v1.6+](http://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-* Install the fleetctl client: Install v0.5.0 from the [fleet GitHub page](https://github.com/coreos/fleet/releases).
+* Install the fleetctl client: Install v0.6.2 from the [fleet GitHub page](https://github.com/coreos/fleet/releases/tag/v0.6.2).
 * Install the Docker client if you want to run Docker commands locally (optional)
 
 A single-node cluster launched with Vagrant will consume about 5 GB of RAM on

Vagrantfile

@@ -11,7 +11,7 @@ else
   cpus = 1
 end
 
-COREOS_VERSION = "386.1.0"
+COREOS_VERSION = "402.2.0"
 
 Vagrant.configure("2") do |config|
   config.vm.box = "coreos-#{COREOS_VERSION}"

builder/Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -yq \
     openssh-server git \
     aufs-tools iptables lxc \
     curl \
-    lxc-docker-1.1.1
+    lxc-docker-1.1.2
 
 # configure ssh server
 RUN rm /etc/ssh/ssh_host_*

contrib/digitalocean/update-coreos

@@ -2,7 +2,7 @@
 
 set -e
 
-COREOS_VERSION=386.1.0
+COREOS_VERSION=402.2.0
 BASE_URL="http://storage.core-os.net/coreos/amd64-usr/$COREOS_VERSION"
 
 KERNEL="/boot/coreos/vmlinuz"

contrib/ec2/deis.template.json

@@ -4,28 +4,28 @@
   "Mappings" : {
       "RegionMap" : {
           "ap-northeast-1" : {
-              "AMI" : "ami-fbf3a1fa"
+              "AMI" : "ami-47cb9246"
           },
           "sa-east-1" : {
-              "AMI" : "ami-edab02f0"
+              "AMI" : "ami-e1f65efc"
           },
           "ap-southeast-2" : {
-              "AMI" : "ami-35d1b60f"
+              "AMI" : "ami-3ba8ce01"
           },
           "ap-southeast-1" : {
-              "AMI" : "ami-2a075f78"
+              "AMI" : "ami-88e4bcda"
           },
           "us-east-1" : {
-              "AMI" : "ami-88e52ce0"
+              "AMI" : "ami-b85786d0"
           },
           "us-west-2" : {
-              "AMI" : "ami-8b532bbb"
+              "AMI" : "ami-451f6575"
           },
           "us-west-1" : {
-              "AMI" : "ami-13eeed56"
+              "AMI" : "ami-45151800"
           },
           "eu-west-1" : {
-              "AMI" : "ami-7de4350a"
+              "AMI" : "ami-72865b05"
           }
       }
   },
@@ -182,7 +182,7 @@
         "UserData" : { "Fn::Base64": { "Fn::Join": [ "", [ ] ] } },
         "BlockDeviceMappings" : [
           {
-            "DeviceName" : "/dev/xvda",
+            "DeviceName" : "/dev/sda",
             "Ebs" : { "VolumeSize" : "100" }
           }
         ]

contrib/rackspace/README.md

@@ -60,6 +60,16 @@ By default, the Makefile will provision 1 router. You can override this by setti
 $ export DEIS_NUM_ROUTERS=2
 ```
 
+### 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

@@ -48,3 +48,4 @@ 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."

controller/scheduler/coreos.py

@@ -129,7 +129,7 @@ def _wait_for_announcer(self, name, env):
         # we bump to 20 minutes here to match the timeout on the router and in the app unit files
         for _ in range(1200):
             status = subprocess.check_output(
-                "fleetctl.sh list-units | grep {name}-announce.service | awk '{{print $5}}'".format(**locals()),
+                "fleetctl.sh list-units --no-legend --fields unit,sub | grep {name}-announce.service | awk '{{print $2}}'".format(**locals()),
                 shell=True, env=env).strip('\n')
             if status == 'running':
                 break
@@ -237,8 +237,8 @@ def attach(self, name):
 
 [Service]
 EnvironmentFile=/etc/environment
-ExecStartPre=/bin/sh -c "until docker inspect -f '{{{{range $i, $e := .HostConfig.PortBindings }}}}{{{{$p := index $e 0}}}}{{{{$p.HostPort}}}}{{{{end}}}}' {name} >/dev/null 2>&1; do sleep 2; done; port=$(docker inspect -f '{{{{range $i, $e := .HostConfig.PortBindings }}}}{{{{$p := index $e 0}}}}{{{{$p.HostPort}}}}{{{{end}}}}' {name}); if [[ -z $port ]]; then echo We have no port...; exit 1; fi; echo Waiting for $port/tcp...; until netstat -lnt | grep :$port >/dev/null; do sleep 1; done"
-ExecStart=/bin/sh -c "port=$(docker inspect -f '{{{{range $i, $e := .HostConfig.PortBindings }}}}{{{{$p := index $e 0}}}}{{{{$p.HostPort}}}}{{{{end}}}}' {name}); echo Connected to $COREOS_PRIVATE_IPV4:$port/tcp, publishing to etcd...; while netstat -lnt | grep :$port >/dev/null; do etcdctl set /deis/services/{app}/{name} $COREOS_PRIVATE_IPV4:$port --ttl 60 >/dev/null; sleep 45; done"
+ExecStartPre=/bin/sh -c "until docker inspect -f '{{{{range $i, $e := .NetworkSettings.Ports }}}}{{{{$p := index $e 0}}}}{{{{$p.HostPort}}}}{{{{end}}}}' {name} >/dev/null 2>&1; do sleep 2; done; port=$(docker inspect -f '{{{{range $i, $e := .NetworkSettings.Ports }}}}{{{{$p := index $e 0}}}}{{{{$p.HostPort}}}}{{{{end}}}}' {name}); if [[ -z $port ]]; then echo We have no port...; exit 1; fi; echo Waiting for $port/tcp...; until netstat -lnt | grep :$port >/dev/null; do sleep 1; done"
+ExecStart=/bin/sh -c "port=$(docker inspect -f '{{{{range $i, $e := .NetworkSettings.Ports }}}}{{{{$p := index $e 0}}}}{{{{$p.HostPort}}}}{{{{end}}}}' {name}); echo Connected to $COREOS_PRIVATE_IPV4:$port/tcp, publishing to etcd...; while netstat -lnt | grep :$port >/dev/null; do etcdctl set /deis/services/{app}/{name} $COREOS_PRIVATE_IPV4:$port --ttl 60 >/dev/null; sleep 45; done"
 ExecStop=/usr/bin/etcdctl rm --recursive /deis/services/{app}/{name}
 TimeoutStartSec=20m