diff options
| -rw-r--r-- | nova/scheduler/filters/ram_filter.py | 2 | ||||
| -rw-r--r-- | nova/scheduler/multi.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 2 | ||||
| -rw-r--r-- | nova/tests/fake_flags.py | 1 | ||||
| -rw-r--r-- | nova/tests/integrated/integrated_helpers.py | 2 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_host_filters.py | 1 |
6 files changed, 9 insertions, 2 deletions
diff --git a/nova/scheduler/filters/ram_filter.py b/nova/scheduler/filters/ram_filter.py index cda3fdfbd..2ed89fa65 100644 --- a/nova/scheduler/filters/ram_filter.py +++ b/nova/scheduler/filters/ram_filter.py @@ -22,7 +22,7 @@ from nova.scheduler import filters LOG = logging.getLogger(__name__) ram_allocation_ratio_opt = cfg.FloatOpt("ram_allocation_ratio", - default=1.0, + default=1.5, help="virtual ram to physical ram allocation ratio") FLAGS = flags.FLAGS diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py index fb8692ffa..e5e1d7362 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/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index 031c02ca3..7779139e6 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -94,6 +94,8 @@ class CloudTestCase(test.TestCase): self.stubs.Set(utils, 'usage_from_instance', dumb) # set up our cloud self.cloud = cloud.CloudController() + self.flags(compute_scheduler_driver='nova.scheduler.' + 'chance.ChanceScheduler') # set up services self.compute = self.start_service('compute') diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py index a067b41bb..e8771b99c 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') diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py index e4e10b035..9909382ca 100644 --- a/nova/tests/integrated/integrated_helpers.py +++ b/nova/tests/integrated/integrated_helpers.py @@ -69,6 +69,8 @@ class _IntegratedTestBase(test.TestCase): image_id = str(image_href).split('/')[-1] return (nova.image.fake.FakeImageService(), image_id) self.stubs.Set(nova.image, 'get_image_service', fake_get_image_service) + self.flags(compute_scheduler_driver='nova.scheduler.' + 'chance.ChanceScheduler') # set up services self.compute = self.start_service('compute') diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 94f8e0be8..f56a14565 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -177,6 +177,7 @@ class HostFiltersTestCase(test.TestCase): def test_ram_filter_fails_on_memory(self): self._stub_service_is_up(True) filt_cls = self.class_map['RamFilter']() + self.flags(ram_allocation_ratio=1.0) filter_properties = {'instance_type': {'memory_mb': 1024}} capabilities = {'enabled': True} service = {'disabled': False} |