Merge pull request #1026 from deis/deis_hosts

fix(Makefile): enable targets to work for non-Vagrant

Author: carmstrong

Makefile

@@ -2,36 +2,7 @@
 # Deis Makefile
 #
 
-ifndef FLEETCTL
-	FLEETCTL = fleetctl --strict-host-key-checking=false
-endif
-
-ifndef FLEETCTL_TUNNEL
-$(error You need to set FLEETCTL_TUNNEL to the IP address of a server in the cluster.)
-endif
-
-ifndef DEIS_NUM_INSTANCES
-	DEIS_NUM_INSTANCES = 1
-endif
-
-ifndef DEIS_NUM_ROUTERS
-	DEIS_NUM_ROUTERS = 1
-endif
-
-ifndef DEIS_FIRST_ROUTER
-	DEIS_FIRST_ROUTER = 1
-endif
-
-DEIS_LAST_ROUTER = $(shell echo $(DEIS_FIRST_ROUTER)\+$(DEIS_NUM_ROUTERS)\-1 | bc)
-
-# TODO refactor to support non-vagrant installations, since this Makefile
-# is now used by the various contrib/ scripts.
-define ssh_all
-	i=1 ; while [ $$i -le $(DEIS_NUM_INSTANCES) ] ; do \
-			vagrant ssh deis-$$i -c $(1) ; \
-			i=`expr $$i + 1` ; \
-	done
-endef
+include includes.mk
 
 define check_for_errors
 	@if $(FLEETCTL) list-units -no-legend | awk '(($$2 == "launched") && ($$5 == "failed"))' | egrep -q "deis-.+service"; then \
@@ -48,37 +19,19 @@ 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...
+# TODO: re-evaluate the fragile start order now that we're on fleet 0.3.2.
 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/*))
-ROUTER_UNITS = $(shell seq -f "deis-router.%g.service" -s " " $(DEIS_FIRST_ROUTER) 1 $(DEIS_LAST_ROUTER))
 
 all: build run
 
 build:
 	$(call ssh_all,'cd share && for c in $(ALL_COMPONENTS); do cd $$c && docker build -t deis/$$c . && cd ..; done')
 
-check-fleet:
-	@LOCAL_VERSION=`$(FLEETCTL) -version`; \
-	REMOTE_VERSION=`ssh -o StrictHostKeyChecking=no core@$(subst :, -p ,$(FLEETCTL_TUNNEL)) fleetctl -version`; \
-	if [ "$$LOCAL_VERSION" != "$$REMOTE_VERSION" ]; then \
-			echo "Your fleetctl client version should match the server. Local version: $$LOCAL_VERSION, server version: $$REMOTE_VERSION. Uninstall your local version and install the latest build from https://github.com/coreos/fleet/releases"; exit 1; \
-	fi
-
 clean: uninstall
 	$(call ssh_all,'for c in $(ALL_COMPONENTS); do docker rm -f deis-$$c; done')
 

builder/Makefile

@@ -1,28 +1,27 @@
-build:
-	vagrant ssh -c 'cd share/builder && docker build -t deis/builder .'
+include ../includes.mk
 
-install:
-	vagrant ssh -c 'sudo systemctl enable /home/core/share/builder/systemd/*'
+build:
+	$(call ssh_all,'cd share/builder && docker build -t deis/builder .')
 
-uninstall: stop
-	vagrant ssh -c 'sudo systemctl disable /home/core/share/builder/systemd/*'
+install: check-fleet
+	$(FLEETCTL) load systemd/*
 
-start:
-	vagrant ssh -c 'sudo systemctl start deis-builder.service'
+uninstall: check-fleet stop
+	$(FLEETCTL) unload systemd/*
+	$(FLEETCTL) destroy systemd/*
 
-stop:
-	vagrant ssh -c 'sudo systemctl stop deis-builder.service'
+start: check-fleet
+	$(FLEETCTL) start -no-block systemd/*
 
-restart:
-	vagrant ssh -c 'sudo systemctl restart deis-builder.service'
+stop: check-fleet
+	$(FLEETCTL) stop -block-attempts=600 systemd/*
 
-logs:
-	vagrant ssh -c 'sudo journalctl -f -u deis-builder.service'
+restart: stop start
 
-run: install restart logs
+run: install start
 
 clean: uninstall
-	vagrant ssh -c 'sudo docker rm -f deis-builder'
+	$(call ssh_all,'sudo docker rm -f deis-builder')
 
 full-clean: clean
-	vagrant ssh -c 'sudo docker rmi deis/builder'
+	$(call ssh_all,'sudo docker rmi deis/builder')

cache/Makefile

@@ -1,28 +1,27 @@
-build:
-	vagrant ssh -c 'cd share/cache && sudo docker build -t deis/cache .'
+include ../includes.mk
 
-install:
-	vagrant ssh -c 'sudo systemctl enable /home/core/share/cache/systemd/*'
+build:
+	$(call ssh_all,'cd share/cache && sudo docker build -t deis/cache .')
 
-uninstall: stop
-	vagrant ssh -c 'sudo systemctl disable /home/core/share/cache/systemd/*'
+install: check-fleet
+	$(FLEETCTL) load systemd/*
 
-start:
-	vagrant ssh -c 'sudo systemctl start deis-cache.service'
+uninstall: check-fleet stop
+	$(FLEETCTL) unload systemd/*
+	$(FLEETCTL) destroy systemd/*
 
-stop:
-	vagrant ssh -c 'sudo systemctl stop deis-cache.service'
+start: check-fleet
+	$(FLEETCTL) start -no-block systemd/*
 
-restart:
-	vagrant ssh -c 'sudo systemctl restart deis-cache.service'
+stop: check-fleet
+	$(FLEETCTL) stop -block-attempts=600 systemd/*
 
-logs:
-	vagrant ssh -c 'sudo journalctl -f -u deis-cache.service'
+restart: stop start
 
-run: install restart logs
+run: install start
 
 clean: uninstall
-	vagrant ssh -c 'sudo docker rm -f deis-cache'
+	$(call ssh_all,'sudo docker rm -f deis-cache')
 
 full-clean: clean
-	vagrant ssh -c 'sudo docker rmi deis/cache'
+	$(call ssh_all,'sudo docker rmi deis/cache')

contrib/ec2/README.md

@@ -82,14 +82,22 @@ you configure your own DNS records using a domain you own. See [Configuring DNS]
 
 ## Use Deis!
 After that, register with Deis!
-```
+```console
 $ deis register deis.example.org:8000
 username: deis
 password:
 password (confirm):
 email: info@opdemand.com
 ```
 
+## Hack on Deis
+If you'd like to use this deployment to build Deis, you'll need to set `DEIS_HOSTS` to an array of your cluster hosts:
+```console
+$ export DEIS_HOSTS=1.2.3.4 1.2.3.5 1.2.3.6
+```
+
+This variable is used in the `make build` command.
+
 [aws-cli]: https://github.com/aws/aws-cli
 [template]: https://s3.amazonaws.com/coreos.com/dist/aws/coreos-alpha.template
 [pro-script]: provision-ec2-cluster.sh

contrib/rackspace/README.md

@@ -77,10 +77,18 @@ You'll need to configure DNS records so you can access applications hosted on De
 
 ### Use Deis!
 After that, register with Deis!
-```
+```console
 $ deis register deis.example.org:8000
 username: deis
 password:
 password (confirm):
 email: info@opdemand.com
 ```
+
+## Hack on Deis
+If you'd like to use this deployment to build Deis, you'll need to set `DEIS_HOSTS` to an array of your cluster hosts:
+```console
+$ export DEIS_HOSTS=10.21.12.1 10.21.12.2 10.21.12.3
+```
+
+This variable is used in the `make build` command.

controller/Makefile

@@ -1,35 +1,34 @@
+include ../includes.mk
+
 .PHONY: all test logs
 
 all: build run
 
 build:
-	vagrant ssh -c 'cd share/controller && sudo docker build -t deis/controller .'
-
-install:
-	vagrant ssh -c 'sudo systemctl enable /home/core/share/controller/systemd/*'
+	$(call ssh_all,'cd share/controller && sudo docker build -t deis/controller .')
 
-uninstall: stop
-	vagrant ssh -c 'sudo systemctl disable /home/core/share/controller/systemd/*'
+install: check-fleet
+	$(FLEETCTL) load systemd/*
 
-start:
-	vagrant ssh -c 'sudo systemctl start deis-controller.service'
+uninstall: check-fleet stop
+	$(FLEETCTL) unload systemd/*
+	$(FLEETCTL) destroy systemd/*
 
-stop:
-	vagrant ssh -c 'sudo systemctl stop deis-controller.service'
+start: check-fleet
+	$(FLEETCTL) start -no-block systemd/*
 
-restart:
-	vagrant ssh -c 'sudo systemctl restart deis-controller.service'
+stop: check-fleet
+	$(FLEETCTL) stop -block-attempts=600 systemd/*
 
-logs:
-	vagrant ssh -c 'sudo journalctl -f -u deis-controller.service'
+restart: stop start
 
-run: install restart logs
+run: install start
 
 clean: uninstall
-	vagrant ssh -c 'sudo docker rm -f deis-controller'
+	$(call ssh_all,'sudo docker rm -f deis-controller')
 
 full-clean: clean
-	vagrant ssh -c 'sudo docker rmi deis/controller'
+	$(call ssh_all,'sudo docker rmi deis/controller')
 
 test:
 	python manage.py test --noinput api web

database/Makefile

@@ -1,28 +1,27 @@
-build:
-	vagrant ssh -c 'cd share/database && sudo docker build -t deis/database .'
+include ../includes.mk
 
-install:
-	vagrant ssh -c 'sudo systemctl enable /home/core/share/database/systemd/*'
+build:
+	$(call ssh_all,'cd share/database && sudo docker build -t deis/database .')
 
-uninstall: stop
-	vagrant ssh -c 'sudo systemctl disable /home/core/share/database/systemd/*'
+install: check-fleet
+	$(FLEETCTL) load systemd/*
 
-start:
-	vagrant ssh -c 'sudo systemctl start deis-database.service'
+uninstall: check-fleet stop
+	$(FLEETCTL) unload systemd/*
+	$(FLEETCTL) destroy systemd/*
 
-stop:
-	vagrant ssh -c 'sudo systemctl stop deis-database.service'
+start: check-fleet
+	$(FLEETCTL) start -no-block systemd/*
 
-restart:
-	vagrant ssh -c 'sudo systemctl restart deis-database.service'
+stop: check-fleet
+	$(FLEETCTL) stop -block-attempts=600 systemd/*
 
-logs:
-	vagrant ssh -c 'sudo journalctl -f -u deis-database.service'
+restart: stop start
 
-run: install restart logs
+run: install start
 
 clean: uninstall
-	vagrant ssh -c 'sudo docker rm -f deis-database'
+	$(call ssh_all,'sudo docker rm -f deis-database')
 
 full-clean: clean
-	vagrant ssh -c 'sudo docker rmi deis/database'
+	$(call ssh_all,'sudo docker rmi deis/database')

includes.mk

@@ -0,0 +1,46 @@
+ifndef FLEETCTL
+  FLEETCTL = fleetctl --strict-host-key-checking=false
+endif
+
+ifndef FLEETCTL_TUNNEL
+$(error You need to set FLEETCTL_TUNNEL to the IP address of a server in the cluster.)
+endif
+
+ifndef DEIS_NUM_INSTANCES
+  DEIS_NUM_INSTANCES = 1
+endif
+
+ifndef DEIS_HOSTS
+  DEIS_HOSTS = $(shell seq -f "172.17.8.%g" -s " " 100 1 `expr $(DEIS_NUM_INSTANCES) + 99` )
+endif
+
+ifndef DEIS_NUM_ROUTERS
+  DEIS_NUM_ROUTERS = 1
+endif
+
+ifndef DEIS_FIRST_ROUTER
+  DEIS_FIRST_ROUTER = 1
+endif
+
+DEIS_LAST_ROUTER = $(shell echo $(DEIS_FIRST_ROUTER)\+$(DEIS_NUM_ROUTERS)\-1 | bc)
+
+define ssh_all
+  for host in $(DEIS_HOSTS); do ssh -o LogLevel=FATAL -o Compression=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PasswordAuthentication=no core@$$host -t $(1); done
+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
+
+ROUTER_UNITS = $(shell seq -f "deis-router.%g.service" -s " " $(DEIS_FIRST_ROUTER) 1 $(DEIS_LAST_ROUTER))
+
+check-fleet:
+  @LOCAL_VERSION=`$(FLEETCTL) -version`; \
+  REMOTE_VERSION=`ssh -o StrictHostKeyChecking=no core@$(subst :, -p ,$(FLEETCTL_TUNNEL)) fleetctl -version`; \
+  if [ "$$LOCAL_VERSION" != "$$REMOTE_VERSION" ]; then \
+      echo "Your fleetctl client version should match the server. Local version: $$LOCAL_VERSION, server version: $$REMOTE_VERSION. Uninstall your local version and install the latest build from https://github.com/coreos/fleet/releases"; exit 1; \
+  fi

logger/Makefile

@@ -1,28 +1,27 @@
-build:
-	vagrant ssh -c 'cd share/logger && sudo docker build -t deis/logger .'
+include ../includes.mk
 
-install:
-	vagrant ssh -c 'sudo systemctl enable /home/core/share/logger/systemd/*'
+build:
+	$(call ssh_all,'cd share/logger && sudo docker build -t deis/logger .')
 
-uninstall: stop
-	vagrant ssh -c 'sudo systemctl disable /home/core/share/logger/systemd/*'
+install: check-fleet
+	$(FLEETCTL) load systemd/*
 
-start:
-	vagrant ssh -c 'sudo systemctl start deis-logger.service'
+uninstall: check-fleet stop
+	$(FLEETCTL) unload systemd/*
+	$(FLEETCTL) destroy systemd/*
 
-stop:
-	vagrant ssh -c 'sudo systemctl stop deis-logger.service'
+start: check-fleet
+	$(FLEETCTL) start -no-block systemd/*
 
-restart:
-	vagrant ssh -c 'sudo systemctl restart deis-logger.service'
+stop: check-fleet
+	$(FLEETCTL) stop -block-attempts=600 systemd/*
 
-logs:
-	vagrant ssh -c 'sudo journalctl -f -u deis-logger.service'
+restart: stop start
 
-run: install restart logs
+run: install start
 
 clean: uninstall
-	vagrant ssh -c 'sudo docker rm -f deis-logger'
+	$(call ssh_all,'sudo docker rm -f deis-logger')
 
 full-clean: clean
-	vagrant ssh -c 'sudo docker rmi deis/logger'
+	$(call ssh_all,'sudo docker rmi deis/logger')