From c0a021ea63b49193e238c0511ba5bcf6699900cd Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 1 Mar 2012 12:59:54 -0800 Subject: [PATCH] fix for bug 821252. Smarter default scheduler compute_scheduler_driver = DistributedScheduler Change-Id: I8123a120afd80c2b088a387eaab8f5a99a877fe0 --- nova/scheduler/multi.py | 3 ++- nova/tests/fake_flags.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py index fb8692ff..e5e1d736 100644 --- a/nova/scheduler/multi.py +++ b/nova/scheduler/multi.py @@ -29,7 +29,8 @@ from nova.scheduler import driver multi_scheduler_opts = [ cfg.StrOpt('compute_scheduler_driver', - default='nova.scheduler.chance.ChanceScheduler', + default='nova.scheduler.' + 'distributed_scheduler.DistributedScheduler', help='Driver to use for scheduling compute calls'), cfg.StrOpt('volume_scheduler_driver', default='nova.scheduler.chance.ChanceScheduler', diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py index a067b41b..e8771b99 100644 --- a/nova/tests/fake_flags.py +++ b/nova/tests/fake_flags.py @@ -42,4 +42,5 @@ FLAGS.set_default('use_ipv6', True) FLAGS.set_default('flat_network_bridge', 'br100') FLAGS.set_default('sqlite_synchronous', False) flags.DECLARE('policy_file', 'nova.policy') +flags.DECLARE('compute_scheduler_driver', 'nova.scheduler.multi') FLAGS.set_default('policy_file', 'nova/tests/policy.json')