Merge pull request #1019 from deis/coreos-317.0.0

chore(contrib/*): update CoreOS to 324.1.0

Author: mboersma

Makefile

@@ -34,7 +34,7 @@ define ssh_all
 endef
 
 define check_for_errors
-	@if $(FLEETCTL) list-units | egrep -q "(failed|dead)"; then \
+	@if $(FLEETCTL) list-units -no-legend | awk '(($$2 == "launched") && ($$5 == "failed"))' | egrep -q "deis-.+service"; then \
 		echo "\033[0;31mOne or more services failed! Check which services by running 'make status'\033[0m" ; \
 		echo "\033[0;31mYou can get detailed output with 'fleetctl status deis-servicename.service'\033[0m" ; \
 		echo "\033[0;31mThis usually indicates an error with Deis - please open an issue on GitHub or ask for help in IRC\033[0m" ; \
@@ -48,18 +48,23 @@ define deis_units
 	  sed -n 's/\(deis-.*\.service\).*/\1/p' | tr '\n' ' ')
 endef
 
+define echo_cyan
+	@echo "\033[0;36m$(subst ",,$(1))\033[0m"
+endef
+
 define echo_yellow
 	@echo "\033[0;33m$(subst ",,$(1))\033[0m"
 endef
 
+# TODO: re-evaluate the start order now that we're on fleet 0.3.2.
 # due to scheduling problems with fleet 0.2.0, start order of components
 # is fragile. hopefully this can be changed soon...
 COMPONENTS=builder cache controller database logger registry
 ALL_COMPONENTS=$(COMPONENTS) router
 START_COMPONENTS=registry logger cache database
 
-ALL_UNITS = $(foreach C, $(COMPONENTS), $(wildcard $(C)/systemd/*))
-START_UNITS = $(foreach C, $(START_COMPONENTS), $(wildcard $(C)/systemd/*))
+ALL_UNITS = $(foreach C,$(COMPONENTS),$(wildcard $(C)/systemd/*))
+START_UNITS = $(foreach C,$(START_COMPONENTS),$(wildcard $(C)/systemd/*))
 ROUTER_UNITS = $(shell seq -f "deis-router.%g.service" -s " " $(DEIS_FIRST_ROUTER) 1 $(DEIS_LAST_ROUTER))
 
 all: build run
@@ -80,8 +85,17 @@ clean: uninstall
 full-clean: clean
 	$(call ssh_all,'for c in $(ALL_COMPONENTS); do docker rmi deis-$$c; done')
 
-install: check-fleet
-	$(FLEETCTL) submit $(START_UNITS)
+install: check-fleet install-routers
+	$(FLEETCTL) load $(START_UNITS)
+	$(FLEETCTL) load controller/systemd/*
+	$(FLEETCTL) load builder/systemd/*
+
+install-routers: check-fleet
+	@$(foreach R, $(ROUTER_UNITS), \
+		cp router/systemd/deis-router.service ./$(R) ; \
+		$(FLEETCTL) load ./$(R) ; \
+		rm -f ./$(R) ; \
+	)
 
 pull:
 	$(call ssh_all,'for c in $(ALL_COMPONENTS); do docker pull deis/$$c; done')
@@ -91,47 +105,66 @@ restart: stop start
 
 run: install start
 
-start: check-fleet start-routers
+start: check-fleet start-warning start-routers
 	@# registry logger cache database
-	$(call echo_yellow,"Starting Deis! Deis will be functional once all services are reported as running... ")
-	$(FLEETCTL) start $(START_UNITS)
-	$(call echo_yellow,"Waiting for deis-registry to start (this can take some time)... ")
-	@until $(FLEETCTL) list-units | egrep -q "deis-registry.+(running|failed|dead)"; do printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | grep "registry" | awk '{printf $$3}'; printf "\r" ; sleep 10; done
+	$(call echo_yellow,"Waiting for deis-registry to start...")
+	$(FLEETCTL) start -no-block $(START_UNITS)
+	@until $(FLEETCTL) list-units | egrep -q "deis-registry.+(running)"; \
+		do sleep 2; \
+			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
+			grep "deis-registry" | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
+			sleep 8; \
+		done
 	$(call check_for_errors)
 
 	@# controller
-	$(call echo_yellow,"Done! Waiting for deis-controller...")
-	$(FLEETCTL) submit controller/systemd/*
-	$(FLEETCTL) start controller/systemd/*
-	@until $(FLEETCTL) list-units | egrep -q "deis-controller.+(running|failed|dead)"; do printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | grep "controller" | awk '{printf $$3}'; printf "\r" ; sleep 10; done
+	$(call echo_yellow,"Waiting for deis-controller to start...")
+	$(FLEETCTL) start -no-block controller/systemd/*
+	@until $(FLEETCTL) list-units | egrep -q "deis-controller.+(running)"; \
+		do sleep 2; \
+			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
+			grep "deis-controller" | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
+			sleep 8; \
+		done
 	$(call check_for_errors)
 
 	@# builder
-	$(call echo_yellow,"Done! Waiting for deis-builder to start (this can also take some time)... ")
-	$(FLEETCTL) submit builder/systemd/*
-	$(FLEETCTL) start builder/systemd/*
-	@until $(FLEETCTL) list-units | egrep -q "deis-builder.+(running|failed|dead)"; do printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | grep "builder" | awk '{printf $$3}'; printf "\r" ; sleep 10; done
+	$(call echo_yellow,"Waiting for deis-builder to start...")
+	$(FLEETCTL) start -no-block builder/systemd/*
+	@until $(FLEETCTL) list-units | egrep -q "deis-builder.+(running)"; \
+		do sleep 2; \
+			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
+			grep "deis-builder" | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
+			sleep 8; \
+		done
 	$(call check_for_errors)
 
 	$(call echo_yellow,"Your Deis cluster is ready to go! Continue following the README to login and use Deis.")
 
-start-routers:
-	$(call echo_yellow,"Starting $(DEIS_NUM_ROUTERS) router(s)...")
-	@ $(foreach U, $(ROUTER_UNITS), \
-		cp router/systemd/deis-router.service ./$(U) ; \
-		$(FLEETCTL) submit ./$(U) ; \
-		$(FLEETCTL) start ./$(U) ; \
-		rm -f ./$(U) ; \
-	)
+start-routers: check-fleet start-warning
+	$(call echo_yellow,"Waiting for 1 of $(DEIS_NUM_ROUTERS) deis-routers to start...")
+	$(foreach R,$(ROUTER_UNITS),$(FLEETCTL) start -no-block $(R);)
+	@until $(FLEETCTL) list-units | egrep -q "deis-router.+(running)"; \
+		do sleep 2; \
+			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
+			grep "deis-router" | head -n 1 | \
+			awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
+			sleep 8; \
+		done
+	$(call check_for_errors)
+
+start-warning:
+	$(call echo_cyan,"Deis components may take a long time to start the first time they are initialized.")
 
 status: check-fleet
 	$(FLEETCTL) list-units
 
 stop: check-fleet
-	$(FLEETCTL) stop $(call deis_units,loaded,.)
+	$(FLEETCTL) stop -block-attempts=600 $(strip $(call deis_units,launched,active))
 
 tests:
 	cd test && bundle install && bundle exec rake
 
 uninstall: check-fleet stop
-	$(FLEETCTL) destroy $(call deis_units,loaded,.)
+	$(FLEETCTL) unload $(call deis_units,launched,.)
+	$(FLEETCTL) destroy $(strip $(call deis_units,.,.))

README.md

@@ -27,7 +27,7 @@ Trying out Deis? Continue following these instructions for a local cluster setup
 ## Install prerequisites
 On your workstation:
 * Install [Vagrant](http://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-* Install the fleetctl client: Install v0.2.0 from the [fleet GitHub page](https://github.com/coreos/fleet/releases).
+* Install the fleetctl client: Install v0.3.2 from the [fleet GitHub page](https://github.com/coreos/fleet/releases).
 * Install the Docker client if you want to run Docker commands locally (optional)
 
 If you're on Ubuntu, you need to install the nfs-kernel-server package as it's required for sharing folders between your host and your CoreOS VM:

Vagrantfile

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

builder/systemd/deis-builder.service

@@ -8,7 +8,7 @@ EnvironmentFile=/etc/environment
 TimeoutStartSec=20m
 ExecStartPre=/bin/sh -c "docker history deis/builder >/dev/null || docker pull deis/builder"
 ExecStartPre=/bin/sh -c "docker inspect deis-builder >/dev/null && docker rm -f deis-builder || true"
-ExecStartPre=/bin/sh -c "docker start deis-builder-data || docker run --name deis-builder-data -v /var/lib/docker deis/base true"
+ExecStartPre=/bin/sh -c "docker inspect deis-builder-data >/dev/null 2>&1 || docker run --name deis-builder-data -v /var/lib/docker deis/base true"
 ExecStart=/usr/bin/docker run --name deis-builder -p 2222:22 -e PUBLISH=22 -e HOST=${COREOS_PRIVATE_IPV4} -e PORT=2222 --volumes-from deis-builder-data --privileged deis/builder
 ExecStartPost=/bin/sh -c "echo 'Waiting for builder on 2222/tcp...' && until cat </dev/null>/dev/tcp/$COREOS_PRIVATE_IPV4/2222; do sleep 1; done"
 ExecStop=/usr/bin/docker rm -f deis-builder

contrib/ec2/deis.template

@@ -4,28 +4,28 @@
   "Mappings" : {
       "RegionMap" : {
           "ap-northeast-1" : {
-              "AMI" : "ami-f1eaadf0"
+              "AMI" : "ami-836c2f82"
           },
           "sa-east-1" : {
-              "AMI" : "ami-0d2b8610"
+              "AMI" : "ami-43ab075e"
           },
           "ap-southeast-2" : {
-              "AMI" : "ami-e952c9d3"
+              "AMI" : "ami-4ba53f71"
           },
           "ap-southeast-1" : {
-              "AMI" : "ami-4494c616"
+              "AMI" : "ami-946d30c6"
           },
           "us-east-1" : {
-              "AMI" : "ami-6e2ecd06"
+              "AMI" : "ami-3221c95a"
           },
           "us-west-2" : {
-              "AMI" : "ami-29374119"
+              "AMI" : "ami-a1c6b791"
           },
           "us-west-1" : {
-              "AMI" : "ami-3eb08b7b"
+              "AMI" : "ami-3c080d79"
           },
           "eu-west-1" : {
-              "AMI" : "ami-1b34f26c"
+              "AMI" : "ami-3f7ab948"
           }
       }
   },

contrib/rackspace/README.md

@@ -53,6 +53,16 @@ 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

@@ -45,3 +45,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

@@ -95,24 +95,24 @@ def start(self, name):
 
     def _start_log(self, name, env):
         subprocess.check_call(
-            'fleetctl.sh start {name}-log.service'.format(**locals()),
+            'fleetctl.sh start -no-block {name}-log.service'.format(**locals()),
             shell=True, env=env)
 
     def _start_container(self, name, env):
         return subprocess.check_call(
-            'fleetctl.sh start {name}.service'.format(**locals()),
+            'fleetctl.sh start -no-block {name}.service'.format(**locals()),
             shell=True, env=env)
 
     def _start_announcer(self, name, env):
         return subprocess.check_call(
-            'fleetctl.sh start {name}-announce.service'.format(**locals()),
+            'fleetctl.sh start -no-block {name}-announce.service'.format(**locals()),
             shell=True, env=env)
 
     def _wait_for_announcer(self, name, env):
         status = None
         for _ in range(60):
             status = subprocess.check_output(
-                "fleetctl.sh list-units | grep {name}-announce.service | awk '{{print $4}}'".format(**locals()),
+                "fleetctl.sh list-units | grep {name}-announce.service | awk '{{print $5}}'".format(**locals()),
                 shell=True, env=env).strip('\n')
             if status == 'running':
                 break
@@ -132,17 +132,17 @@ def stop(self, name):
 
     def _stop_container(self, name, env):
         return subprocess.check_call(
-            'fleetctl.sh stop {name}.service'.format(**locals()),
+            'fleetctl.sh stop -block-attempts=600 {name}.service'.format(**locals()),
             shell=True, env=env)
 
     def _stop_announcer(self, name, env):
         return subprocess.check_call(
-            'fleetctl.sh stop {name}-announce.service'.format(**locals()),
+            'fleetctl.sh stop -block-attempts=600 {name}-announce.service'.format(**locals()),
             shell=True, env=env)
 
     def _stop_log(self, name, env):
         return subprocess.check_call(
-            'fleetctl.sh stop {name}-announce.service'.format(**locals()),
+            'fleetctl.sh stop -block-attempts=600 {name}-log.service'.format(**locals()),
             shell=True, env=env)
 
     def destroy(self, name):

database/systemd/deis-database.service

@@ -6,7 +6,7 @@ EnvironmentFile=/etc/environment
 TimeoutStartSec=20m
 ExecStartPre=/bin/sh -c "docker history deis/database >/dev/null || docker pull deis/database"
 ExecStartPre=/bin/sh -c "docker inspect deis-database >/dev/null && docker rm -f deis-database || true"
-ExecStartPre=/bin/sh -c "docker start deis-database-data || docker run --name deis-database-data -v /var/lib/postgresql deis/base true"
+ExecStartPre=/bin/sh -c "docker inspect deis-database-data >/dev/null 2>&1 || docker run --name deis-database-data -v /var/lib/postgresql deis/base true"
 ExecStart=/usr/bin/docker run --name deis-database -p 5432:5432 -e PUBLISH=5432 -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from deis-database-data deis/database
 ExecStop=/usr/bin/docker rm -f deis-database
 

logger/systemd/deis-logger.service

@@ -6,7 +6,7 @@ EnvironmentFile=/etc/environment
 TimeoutStartSec=20m
 ExecStartPre=/bin/sh -c "docker history deis/logger >/dev/null || docker pull deis/logger"
 ExecStartPre=/bin/sh -c "docker inspect deis-logger >/dev/null && docker rm -f deis-logger || true"
-ExecStartPre=/bin/sh -c "docker start deis-logger-data || docker run --name deis-logger-data -v /var/log/deis deis/base true"
+ExecStartPre=/bin/sh -c "docker inspect deis-logger-data >/dev/null 2>&1 || docker run --name deis-logger-data -v /var/log/deis deis/base true"
 ExecStart=/usr/bin/docker run --name deis-logger -p 514:514/udp -e PUBLISH=514 -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from deis-logger-data deis/logger
 ExecStop=/usr/bin/docker rm -f deis-logger