fix(*): make containers host-aware

Before, you had to hardcode the host's IP address and the IP address
to the etcd cluster. Now that we are on CoreOS, we can make some
assumptions about the system, including the default gateway and
where etcd is located.

The host IP address was always accessible through the default gateway,
so there's a change to use netstat to grep for the ip address
of the docker0 bridge. Using that, we can also assume that etcd
is clustered on the host vs. a remote container on some other node,
so we can just use the host IP address and a default port number
to retrieve the endpoint.

We should be using Fleet to manage these containers, so I removed
the dependencies on certain systemd units, since fleet already
considers those units to be running on each host. I also removed
the dependency on deis-builder to be running before deis-controller
can be started. We did this because we wanted to ensure that users
did not run into issues when running a git push, but I feel that it's
a poor decision to kill the controller if the builder is down. By that
argument, we should kill the controller when *any* component comes
down. A `fleetctl list-units` should be more than enough to ensure
that the containers are running as they should be.

Author: Matthew Fisher

bin/boot

@@ -9,8 +9,12 @@ set -eo pipefail
 # set debug based on envvar
 [[ $DEBUG ]] && set -x
 
+# HACK: get the host IP address through the default gateway
+export HOST=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
+
 # configure etcd
-export ETCD=${ETCD:-172.17.42.1:4001}
+export ETCD_PORT=${ETCD_PORT:-4001}
+export ETCD="$HOST:$ETCD_PORT"
 export ETCD_PATH=${ETCD_PATH:-/deis/controller}
 export ETCD_TTL=${ETCD_TTL:-10}
 
@@ -69,11 +73,10 @@ CONFD_PID=$!
 
 echo deis-controller running...
 
-# publish the service to etcd using the injected HOST and PORT
+# publish the service to etcd using the injected PORT
 if [[ ! -z $PUBLISH ]]; then
 
 	# configure service discovery
-	HOST=${HOST:-localhost}
 	PORT=${PORT:-8000}
 	PROTO=${PROTO:-tcp}
 

scheduler/coreos.py

@@ -199,7 +199,7 @@ def attach(self, name):
 
 [Service]
 ExecStartPre=/usr/bin/docker pull {image}
-ExecStart=-/usr/bin/docker run --name {name} -P -e PORT={port} -e ETCD=172.17.42.1:4001 {image} {command}
+ExecStart=-/usr/bin/docker run --name {name} -P -e PORT={port} {image} {command}
 ExecStop=-/usr/bin/docker rm -f {name}
 """
 
@@ -238,7 +238,7 @@ def attach(self, name):
 
 [Service]
 ExecStartPre=/usr/bin/docker pull {image}
-ExecStart=-/usr/bin/docker run --name {name} -p 80:80 -p 443:443 -e ETCD=172.17.42.1:4001 {image} {command}
+ExecStart=-/usr/bin/docker run --name {name} -p 80:80 -p 443:443 {image} {command}
 ExecStop=-/usr/bin/docker rm -f {name}
 TimeoutStartSec=10min
 """
@@ -251,6 +251,6 @@ def attach(self, name):
 
 [Service]
 ExecStartPre=/usr/bin/docker pull {image}
-ExecStart=-/usr/bin/docker run --name {name} -p 514:514 -e HOST=%H -e PORT=514 -e ETCD=172.17.42.1:4001 {image} {command}
+ExecStart=-/usr/bin/docker run --name {name} -p 514:514 -e PORT=514 {image} {command}
 ExecStop=-/usr/bin/docker rm -f {name}
 """

systemd/deis-controller.service

@@ -1,11 +1,11 @@
 [Unit]
 Description=deis-controller
-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
+TimeoutStartSec=20m
+ExecStartPre=/usr/bin/docker pull deis/controller:latest
+ExecStart=/usr/bin/docker run --name deis-controller -p 8000:8000 -e PUBLISH=8000 deis/controller
+ExecStop=/usr/bin/docker rm -f deis-controller
 
 [Install]
 WantedBy=multi-user.target