bug(systemd): fix dependencies

This commit does several things:
* Refactor After and Requires to list all units on one line
* Make seed-registry job dependent upon deis-registry
* Make controller dependent on (and wait for) Builder
* Make all services only start after etcd

closes #706, #708

Author: carmstrong

builder/systemd/deis-builder.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=deis-builder
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
-Requires=etcd.service
+Requires=docker.service docker-tcp.socket etcd.service
+After=docker.service etcd.service
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-builder || /usr/bin/docker run --name deis-builder -p 2222:22 -e PUBLISH=22 -e HOST=172.17.8.100 -e PORT=2222 -e ETCD=172.17.8.100:4001 --privileged deis/builder'
 ExecStop=/usr/bin/docker stop deis-builder
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

cache/systemd/deis-cache.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=deis-cache
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
-Requires=etcd.service
+Requires=docker.service docker-tcp.socket etcd.service
+After=docker.service etcd.service
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-cache || /usr/bin/docker run --name deis-cache -p 6379:6379 -e PUBLISH=6379 -e HOST=172.17.8.100 -e ETCD=172.17.8.100:4001 deis/cache'
 ExecStop=/usr/bin/docker stop deis-cache
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

contrib/coreos/user-data

@@ -87,7 +87,8 @@ coreos:
     content: |
       [Unit]
       Description=Seed Deis Registry with Docker Images
-      Requires=seed-docker-images.service
+      Requires=seed-docker-images.service deis-registry.service
+      After=deis-registry.service
 
       [Service]
       Type=oneshot

controller/systemd/deis-controller.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=deis-controller
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
-Requires=etcd.service
+Requires=docker.service docker-tcp.socket etcd.service deis-builder.service
+After=docker.service etcd.service deis-builder.service
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-controller || /usr/bin/docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000 -e HOST=172.17.8.100 -e ETCD=172.17.8.100:4001 deis/controller'
 ExecStop=/usr/bin/docker stop deis-controller
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

database/systemd/deis-database.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=deis-database
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
-Requires=etcd.service
+Requires=docker.service docker-tcp.socket etcd.service
+After=docker.service etcd.service
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-database || /usr/bin/docker run --name deis-database -p 5432:5432 -e PUBLISH=5432 -e HOST=172.17.8.100 -e ETCD=172.17.8.100:4001 deis/database'
 ExecStop=/usr/bin/docker stop deis-database
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

discovery/systemd/deis-discovery.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=deis-discovery
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
+Requires=docker.service docker-tcp.socket etcd.service
+After=docker.service etcd.service
 StandardOutput=null
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-discovery || /usr/bin/docker run --name deis-discovery -p 5001:4001 -e PUBLIC_IP=10.1.42.1 deis/discovery'
 ExecStop=/usr/bin/docker stop deis-discovery
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

logger/systemd/deis-logger.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=deis-logger
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
-Requires=etcd.service
+Requires=docker.service docker-tcp.socket etcd.service
+After=docker.service etcd.service
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-logger || /usr/bin/docker run --name deis-logger -p 514:514 -e PUBLISH=514 -e HOST=172.17.8.100 -e ETCD=172.17.8.100:4001 deis/logger'
 ExecStop=/usr/bin/docker stop deis-logger
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

registry/systemd/deis-registry.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=deis-registry
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
-Requires=etcd.service
+Requires=docker.service docker-tcp.socket etcd.service
+After=docker.service etcd.service
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-registry || /usr/bin/docker run --name deis-registry -p 5000:5000 -e PUBLISH=5000 -e HOST=172.17.8.100 -e ETCD=172.17.8.100:4001 deis/registry'
 ExecStop=/usr/bin/docker stop deis-registry
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

router/systemd/deis-router.service

@@ -1,13 +1,11 @@
 [Unit]
 Description=deis-router
-After=docker.service
-Requires=docker.service
-Requires=docker-tcp.socket
-Requires=etcd.service
+Requires=docker.service docker-tcp.socket etcd.service
+After=docker.service etcd.service
 
 [Service]
 ExecStart=/bin/bash -c '/usr/bin/docker start -a deis-router || /usr/bin/docker run --name deis-router -p 80:80 -e PUBLISH=80 -e HOST=172.17.8.100 -e ETCD=172.17.8.100:4001 deis/router'
 ExecStop=/usr/bin/docker stop deis-router
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target