commit 9cd1286da39cd9e8471b9b7644dc63ad6bfac429
author Paul Belanger <pabelanger@redhat.com> Wed Mar 15 13:03:59 2017 -0400
committer Paul Belanger <pabelanger@redhat.com> Wed Mar 15 13:15:11 2017 -0400
tree d9b1b54661569bb27ec913ebd73584e0c97ebe72
parent 174a8274d064ab5bd4898f747500533868a7d5db

Clean up additional references to launcher

Seems we missed these in our previous commit.

Change-Id: I630d02e45f0a17cd6f5886fcf9a971a8264ebf10
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

zuul/cmd/executor.py

diff --git a/zuul/cmd/executor.py b/zuul/cmd/executor.py
index 13d24b4..96ba4b3 100644
--- a/zuul/cmd/executor.py
+++ b/zuul/cmd/executor.py
@@ -79,9 +79,9 @@
 
         self.log = logging.getLogger("zuul.Executor")
 
-        LaunchServer = zuul.executor.server.LaunchServer
-        self.executor = LaunchServer(self.config, self.connections,
-                                     keep_jobdir=self.args.keep_jobdir)
+        ExecutorServer = zuul.executor.server.ExecutorServer
+        self.executor = ExecutorServer(self.config, self.connections,
+                                       keep_jobdir=self.args.keep_jobdir)
         self.executor.start()
 
         signal.signal(signal.SIGUSR2, zuul.cmd.stack_dump_handler)

zuul/cmd/scheduler.py

diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py
index 889ad2b..ff4e1f4 100755
--- a/zuul/cmd/scheduler.py
+++ b/zuul/cmd/scheduler.py
@@ -141,7 +141,7 @@
 
         self.sched = zuul.scheduler.Scheduler(self.config)
 
-        gearman = zuul.executor.client.LaunchClient(self.config, self.sched)
+        gearman = zuul.executor.client.ExecutorClient(self.config, self.sched)
         merger = zuul.merger.client.MergeClient(self.config, self.sched)
         nodepool = zuul.nodepool.Nodepool(self.sched)