diff options
| author | Brian Elliott <brian.elliott@rackspace.com> | 2012-09-13 21:50:14 +0000 |
|---|---|---|
| committer | Brian Elliott <brian.elliott@rackspace.com> | 2012-09-14 00:12:56 +0000 |
| commit | 63fdfcbdcd8a0dd8422ff83f8ee2b9603a4a6c94 (patch) | |
| tree | e274cea3146e15dc7459e9def5eb62901bbcec10 /nova | |
| parent | 9d791c1225d4923a8e25060490b931c669e4424d (diff) | |
| download | nova-63fdfcbdcd8a0dd8422ff83f8ee2b9603a4a6c94.tar.gz nova-63fdfcbdcd8a0dd8422ff83f8ee2b9603a4a6c94.tar.xz nova-63fdfcbdcd8a0dd8422ff83f8ee2b9603a4a6c94.zip | |
Correct typo in memory_mb_limit filter property
Fixes bug blocking memory oversubscription in builds
bug 1048842
Change-Id: I932d0a7248f231127965331886664bfd9092dad0
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/scheduler/filters/ram_filter.py | 2 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_host_filters.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/scheduler/filters/ram_filter.py b/nova/scheduler/filters/ram_filter.py index 6ae9c654a..8fb89bf5b 100644 --- a/nova/scheduler/filters/ram_filter.py +++ b/nova/scheduler/filters/ram_filter.py @@ -51,5 +51,5 @@ class RamFilter(filters.BaseHostFilter): # save oversubscribe ram limit so the compute host can verify # memory availability on builds: - filter_properties['memory_limit_mb'] = oversubscribed_ram_limit_mb + filter_properties['memory_mb_limit'] = oversubscribed_ram_limit_mb return True diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index b87db7b06..19b008212 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -542,7 +542,7 @@ class HostFiltersTestCase(test.TestCase): filt_cls.host_passes(host, filter_properties) self.assertEqual(host.total_usable_ram_mb * 2.0, - filter_properties['memory_limit_mb']) + filter_properties['memory_mb_limit']) def test_compute_filter_fails_on_service_disabled(self): self._stub_service_is_up(True) |