Generalize the ephemeral build managers so that any manager may manage a builder spawned by any other manager.

buildman/server.py

@@ -37,7 +37,7 @@ class BuilderServer(object):
       controller.
   """
   def __init__(self, registry_hostname, queue, build_logs, user_files, lifecycle_manager_klass,
-               lifecycle_manager_config, manager_public_ip):
+               lifecycle_manager_config, manager_hostname):
     self._loop = None
     self._current_status = 'starting'
     self._current_components = []
@@ -53,7 +53,7 @@ class BuilderServer(object):
         self._unregister_component,
         self._job_heartbeat,
         self._job_complete,
-        manager_public_ip,
+        manager_hostname,
         HEARTBEAT_PERIOD_SEC,
     )
     self._lifecycle_manager_config = lifecycle_manager_config
@@ -158,7 +158,7 @@ class BuilderServer(object):
         self._queue.incomplete(job_item, restore_retry=False)
 
       logger.debug('Build job found. Checking for an avaliable worker.')
-      scheduled = yield From(self._lifecycle_manager.schedule(build_job, self._loop))
+      scheduled = yield From(self._lifecycle_manager.schedule(build_job))
       if scheduled:
         self._job_count = self._job_count + 1
         logger.debug('Build job scheduled. Running: %s', self._job_count)
@@ -168,7 +168,6 @@ class BuilderServer(object):
 
       yield From(trollius.sleep(WORK_CHECK_TIMEOUT))
 
-
   @trollius.coroutine
   def _initialize(self, loop, host, ssl=None):
     self._loop = loop