fix(builder): reside beside the controller

The client makes the assumption that the builder is on the
same machine as the controller. We should eventually get this in
a distributed way, but placing it on the same machine as the
controller for now will work.

Author: Matthew Fisher

builder/systemd/deis-builder.service

@@ -10,3 +10,6 @@ ExecStop=/usr/bin/docker rm -f deis-builder
 
 [Install]
 WantedBy=multi-user.target
+
+[X-Fleet]
+X-ConditionMachineOf=deis-controller.service

client/deis.py

@@ -456,6 +456,7 @@ def apps_create(self, args):
             app_id = data['id']
             print("done, created {}".format(app_id))
             # add a git remote
+            # TODO: retrieve the hostname from service discovery
             hostname = urlparse.urlparse(self._settings['controller']).netloc.split(':')[0]
             git_remote = "ssh://git@{hostname}:2222/{app_id}.git".format(**locals())
             try: