Merge pull request #1940 from carmstrong/coreos_452.0.0

chore(*): bump CoreOS to 452.0.0

Author: carmstrong

Vagrantfile

@@ -35,7 +35,7 @@ else
   $vb_cpus = 1
 end
 
-COREOS_VERSION = "444.0.0"
+COREOS_VERSION = "452.0.0"
 
 if File.exist?(CONFIG)
   require CONFIG

contrib/bare-metal/README.md

@@ -49,7 +49,7 @@ coreos-install -C alpha -c /tmp/config -d /dev/sda
 ```
 
 This will install the current [CoreOS](https://coreos.com/) release to disk. If you want to install the recommended [CoreOS](https://coreos.com/) version check the [Deis changelog](../../CHANGELOG.md)
-and specify that version by appending the `-V` parameter to the install command, e.g. `-V 444.0.0`.
+and specify that version by appending the `-V` parameter to the install command, e.g. `-V 452.0.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.
 

contrib/ec2/deis.template.json

@@ -84,14 +84,14 @@
 
   "Mappings" : {
     "CoreOSAMIs" : {
-      "us-east-1"      : { "PV" : "ami-1a862f72", "HVM" : "ami-18862f70" },
-      "us-west-2"      : { "PV" : "ami-1189c921", "HVM" : "ami-2f89c91f" },
-      "us-west-1"      : { "PV" : "ami-01aba244", "HVM" : "ami-07aba242" },
-      "eu-west-1"      : { "PV" : "ami-428d2a35", "HVM" : "ami-448d2a33" },
-      "ap-southeast-1" : { "PV" : "ami-aee1c5fc", "HVM" : "ami-a8e1c5fa" },
-      "ap-southeast-2" : { "PV" : "ami-0546253f", "HVM" : "ami-7b462541" },
-      "ap-northeast-1" : { "PV" : "ami-39062938", "HVM" : "ami-37062936" },
-      "sa-east-1"      : { "PV" : "ami-d96cc6c4", "HVM" : "ami-df6cc6c2" }
+      "us-east-1"      : { "PV" : "ami-fc60d494", "HVM" : "ami-fe60d496" },
+      "us-west-2"      : { "PV" : "ami-03de9d33", "HVM" : "ami-01de9d31" },
+      "us-west-1"      : { "PV" : "ami-2b81896e", "HVM" : "ami-2981896c" },
+      "eu-west-1"      : { "PV" : "ami-ee983999", "HVM" : "ami-ec98399b" },
+      "ap-southeast-1" : { "PV" : "ami-2e486f7c", "HVM" : "ami-2c486f7e" },
+      "ap-southeast-2" : { "PV" : "ami-ddd4b7e7", "HVM" : "ami-d3d4b7e9" },
+      "ap-northeast-1" : { "PV" : "ami-9994bd98", "HVM" : "ami-9794bd96" },
+      "sa-east-1"      : { "PV" : "ami-3119b32c", "HVM" : "ami-3319b32e" }
     },
     "RootDevices" : {
       "HVM" : { "Name": "/dev/xvda" },

contrib/rackspace/README.md

@@ -54,16 +54,6 @@ Usage: provision-rackspace-cluster.sh <key pair name> [flavor]
 $ ./provision-rackspace-cluster.sh deis-key
 ```
 
-### 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
 DEISCTL_TUNNEL and install the platform:

contrib/rackspace/provision-rackspace-cluster.sh

@@ -42,11 +42,10 @@ $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 423.0.0
-    supernova production boot --image e90d62b9-0f01-4da9-9e06-79b8ddf42a70 --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
+    # this image is CoreOS 452.0.0
+    supernova production boot --image 7f116bdd-9b17-410c-b049-eb1bca1b7087 --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."

deisctl/units/deis-builder.service

@@ -7,7 +7,7 @@ TimeoutStartSec=30m
 ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
 ExecStartPre=/bin/sh -c "docker inspect deis-builder >/dev/null && docker rm -f deis-builder || true"
 ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder` && docker run --name deis-builder --rm -p 2223:22 -e EXTERNAL_PORT=2223 -e HOST=$COREOS_PRIVATE_IPV4 --privileged $IMAGE"
-ExecStartPost=/bin/sh -c "echo 'Waiting for builder on 2223/tcp...' && until /bin/sh -c \"cat </dev/null>/dev/tcp/$COREOS_PRIVATE_IPV4/2223\" >/dev/null 2>&1; do sleep 1; done"
+ExecStartPost=/bin/sh -c "echo 'Waiting for builder on 2223/tcp...' && until echo 'dummy-value' | ncat $COREOS_PRIVATE_IPV4 2223 >/dev/null 2>&1; do sleep 1; done"
 ExecStopPost=/usr/bin/docker stop deis-builder
 
 [Install]

deisctl/units/deis-registry.service

@@ -9,7 +9,7 @@ TimeoutStartSec=30m
 ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/registry`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
 ExecStartPre=/bin/sh -c "docker inspect deis-registry >/dev/null && docker rm -f deis-registry || true"
 ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/registry` && docker run --name deis-registry --rm -p 5000:5000 -e EXTERNAL_PORT=5000 -e HOST=$COREOS_PRIVATE_IPV4 --volumes-from deis-registry-data $IMAGE"
-ExecStartPost=/bin/sh -c "echo 'Waiting for listener on 5000/tcp...' && until /bin/sh -c \"cat </dev/null>/dev/tcp/$COREOS_PRIVATE_IPV4/5000\" >/dev/null 2>&1; do sleep 1; done && docker pull deis/slugrunner:latest && docker tag deis/slugrunner $COREOS_PRIVATE_IPV4:5000/deis/slugrunner && docker push $COREOS_PRIVATE_IPV4:5000/deis/slugrunner"
+ExecStartPost=/bin/sh -c "echo 'Waiting for listener on 5000/tcp...' && until echo 'dummy-value' | ncat $COREOS_PRIVATE_IPV4 5000 >/dev/null 2>&1; do sleep 1; done && docker pull deis/slugrunner:latest && docker tag deis/slugrunner $COREOS_PRIVATE_IPV4:5000/deis/slugrunner && docker push $COREOS_PRIVATE_IPV4:5000/deis/slugrunner"
 ExecStopPost=/usr/bin/docker stop deis-registry
 
 [Install]