From 5ef64542355da51caf015e6d7d1aa2090b117d2b Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Thu, 1 Jun 2017 23:21:50 +0000 Subject: [PATCH] Change default scheduler to filter_scheduler The current default is chance_scheduler which simply randomly pick a host. As filter_scheduler is available, it is time to switch the default to filter_scheduler. Change-Id: I0ff1fd866de593716385df919cdf1ddf510c0512 --- zun/conf/scheduler.py | 2 +- zun/tests/unit/scheduler/test_client.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zun/conf/scheduler.py b/zun/conf/scheduler.py index 4316e9806..ede62acd1 100644 --- a/zun/conf/scheduler.py +++ b/zun/conf/scheduler.py @@ -21,7 +21,7 @@ scheduler_group = cfg.OptGroup(name="scheduler", scheduler_opts = [ cfg.StrOpt("driver", - default="chance_scheduler", + default="filter_scheduler", choices=("chance_scheduler", "fake_scheduler", "filter_scheduler"), help=""" diff --git a/zun/tests/unit/scheduler/test_client.py b/zun/tests/unit/scheduler/test_client.py index 6f13bd8be..13d704b6a 100644 --- a/zun/tests/unit/scheduler/test_client.py +++ b/zun/tests/unit/scheduler/test_client.py @@ -14,8 +14,8 @@ import mock from oslo_config import cfg -from zun.scheduler import chance_scheduler from zun.scheduler import client as scheduler_client +from zun.scheduler import filter_scheduler from zun.tests import base from zun.tests.unit.scheduler import fake_scheduler @@ -32,14 +32,14 @@ class SchedulerClientTestCase(base.TestCase): def test_init_using_default_schedulerdriver(self): driver = self.client_cls().driver - self.assertIsInstance(driver, chance_scheduler.ChanceScheduler) + self.assertIsInstance(driver, filter_scheduler.FilterScheduler) def test_init_using_custom_schedulerdriver(self): CONF.set_override('driver', 'fake_scheduler', group='scheduler') driver = self.client_cls().driver self.assertIsInstance(driver, fake_scheduler.FakeScheduler) - @mock.patch('zun.scheduler.chance_scheduler.ChanceScheduler' + @mock.patch('zun.scheduler.filter_scheduler.FilterScheduler' '.select_destinations') def test_select_destinations(self, mock_select_destinations): fake_args = ['ctxt', 'fake_containers']