Make ConnectionRegistry mandatory for Scheduler

So far the connection registry was added after the Scheduler was
instantiated.

We can make the ConnectionRegistry mandatory to simplify the
Scheduler instantiation.

Change-Id: Iff7b1a597c97f2cd13bea75f9f23585b0e7f76b3

1 files changed, 4 insertions, 4 deletions

diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py
index 42d6e0f31..89435b39d 100755
--- a/zuul/cmd/scheduler.py
+++ b/zuul/cmd/scheduler.py
@@ -138,12 +138,13 @@ class Scheduler(zuul.cmd.ZuulDaemonApp):
         self.setup_logging('scheduler', 'log_config')
         self.log = logging.getLogger("zuul.Scheduler")
 
-        self.sched = zuul.scheduler.Scheduler(self.config)
+        self.configure_connections(require_sql=True)
+        self.sched = zuul.scheduler.Scheduler(self.config, self.connections)
+        if self.args.validate_tenants is None:
+            self.connections.registerScheduler(self.sched)
 
         self.sched.setZuulApp(self)
         merger = zuul.merger.client.MergeClient(self.config, self.sched)
-
-        self.configure_connections(require_sql=True)
         self.sched.setMerger(merger)
 
         if self.args.validate_tenants is None:
@@ -159,7 +160,6 @@ class Scheduler(zuul.cmd.ZuulDaemonApp):
         self.log.info('Starting scheduler')
         try:
             self.sched.start()
-            self.sched.registerConnections(self.connections)
             self.sched.reconfigure(self.config,
                                    validate_tenants=self.args.validate_tenants)
             self.sched.wakeUp()