Merge pull request #3676 from carmstrong/coreos-647.0.0

chore(*): bump CoreOS to 647.0.0

Author: carmstrong

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 = ">= 633.1.0"
+  config.vm.box_version = ">= 647.0.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|

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-633.1.0',
-                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-633.1.0]')
+parser.add_argument('--coreos-image', default='2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-647.0.0',
+                   help='optional, [2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-647.0.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',
@@ -163,7 +163,7 @@ def network_config(subnet_name=None, port='59913', public_ip_name=None):
         if not args.nohttps:
           network.input_endpoints.input_endpoints.append(lb_endpoint_config('https', '443', load_balancer_probe(None, '443', 'tcp')))
         # create builder endpoint TCP probe check and extended timeout
-        network.input_endpoints.input_endpoints.append(lb_endpoint_config('builder', '2222', 
+        network.input_endpoints.input_endpoints.append(lb_endpoint_config('builder', '2222',
 load_balancer_probe(None, '2222', 'tcp',), 20))
     return network
 

contrib/coreos/user-data.example

@@ -20,18 +20,6 @@ coreos:
   units:
   - name: etcd.service
     command: start
-  - name: upgrade-fleet-091.service
-    command: start
-    content: |
-      [Unit]
-      Description=Upgrade fleet if system fleet is v0.9.1, which has a known bug
-      Before=fleet.service
-      ConditionPathIsSymbolicLink=!/etc/systemd/system/fleet.service.d/99-upgrade-fleet-091.conf
-
-      [Service]
-      ExecStart=/usr/bin/bash -c 'if fleetd --version | grep -q 0.9.1; then curl -sSL --retry 5 --retry-delay 2 -o /opt/bin/fleetd-0.9.2 https://s3-us-west-2.amazonaws.com/opdemand/fleetd-v0.9.2 && chmod +x /opt/bin/fleetd-0.9.2 && mkdir -p /etc/systemd/system/fleet.service.d/ && ln -sf /opt/conf/fleetd-092-custom-binary.conf /etc/systemd/system/fleet.service.d/99-upgrade-fleet-091.conf; else rm -f /etc/systemd/system/fleet.service.d/99-upgrade-fleet-091.conf; fi'
-      RemainAfterExit=yes
-      Type=oneshot
   - name: docker-tcp.socket
     command: start
     enable: true
@@ -208,8 +196,3 @@ write_files:
       [Service]
       ExecStart=
       ExecStart=/usr/sbin/ntpd -g -n -f /var/lib/ntp/ntp.drift
-  - path: /opt/conf/fleetd-092-custom-binary.conf
-    content: |
-      [Service]
-      ExecStart=
-      ExecStart=/opt/bin/fleetd-0.9.2

contrib/ec2/deis.template.json

@@ -108,15 +108,16 @@
 
   "Mappings" : {
     "CoreOSAMIs" : {
-      "eu-central-1"   : { "PV" : "ami-8c003c91", "HVM" : "ami-92003c8f" },
-      "ap-northeast-1" : { "PV" : "ami-9eb9439e", "HVM" : "ami-9cb9439c" },
-      "sa-east-1"      : { "PV" : "ami-9be66386", "HVM" : "ami-99e66384" },
-      "ap-southeast-2" : { "PV" : "ami-d53845ef", "HVM" : "ami-cb3845f1" },
-      "ap-southeast-1" : { "PV" : "ami-a2cefcf0", "HVM" : "ami-a0cefcf2" },
-      "us-east-1"      : { "PV" : "ami-d6033bbe", "HVM" : "ami-d2033bba" },
-      "us-west-2"      : { "PV" : "ami-39280209", "HVM" : "ami-37280207" },
-      "us-west-1"      : { "PV" : "ami-4df91b09", "HVM" : "ami-43f91b07" },
-      "eu-west-1"      : { "PV" : "ami-2f422358", "HVM" : "ami-21422356" }
+      "eu-central-1"   : { "PV" : "ami-3c764821", "HVM" : "ami-38764825" },
+      "ap-northeast-1" : { "PV" : "ami-9022eb90", "HVM" : "ami-8e22eb8e" },
+      "us-gov-west-1"  : { "PV" : "ami-cf0868ec", "HVM" : "ami-c90868ea" },
+      "sa-east-1"      : { "PV" : "ami-1113940c", "HVM" : "ami-1313940e" },
+      "ap-southeast-2" : { "PV" : "ami-6d83fc57", "HVM" : "ami-6383fc59" },
+      "ap-southeast-1" : { "PV" : "ami-8a546ad8", "HVM" : "ami-84546ad6" },
+      "us-east-1"      : { "PV" : "ami-e8657580", "HVM" : "ami-ea657582" },
+      "us-west-2"      : { "PV" : "ami-67427157", "HVM" : "ami-65427155" },
+      "us-west-1"      : { "PV" : "ami-75dd3331", "HVM" : "ami-77dd3333" },
+      "eu-west-1"      : { "PV" : "ami-4d1c763a", "HVM" : "ami-4b1c763c" }
 
     },
     "RootDevices" : {

contrib/rackspace/provision-rackspace-cluster.sh

@@ -49,6 +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 647.0.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

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, ``633.1.0``. To specify a CoreOS
-version, append the ``-V`` parameter to the install command, e.g. ``-V 633.1.0``.
+platforms typically specify a CoreOS version - currently, ``647.0.0``. To specify a CoreOS
+version, append the ``-V`` parameter to the install command, e.g. ``-V 647.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.

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-633-1-0-v20150414 \
+      --image coreos-stable-647-0-0-v20150512 \
       --image-project coreos-cloud;
     done