openstack/nova
Code Issues Proposed changes

Merge "fixes bug 883233. Added to Authors fix typo in scheduler/driver.py assert_compute_node_has_enough_memory."

Browse Source
This commit is contained in:
Jenkins 2011-10-30 03:40:25 +00:00 committed by Gerrit Code Review
commit 5b8133a839
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@ -55,6 +55,7 @@ Jason Koelker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com>
Jesse Andrews <anotherjesse@gmail.com>
Jimmy Bergman <jimmy@sigint.se>
Joe Gordon <jogo@cloudscaling.com>
Joe Heck <heckj@mac.com>
Joel Moore <joelbm24@gmail.com>
Johannes Erdfelt <johannes.erdfelt@rackspace.com>

3
nova/scheduler/driver.py
View File

@ -382,7 +382,8 @@ class Scheduler(object):
if avail <= mem_inst:
instance_id = ec2utils.id_to_ec2_id(instance_ref['id'])
reason = _("Unable to migrate %(instance_id)s to %(dest)s: "
"Lack of disk(host:%(avail)s <= instance:%(mem_inst)s)")
"Lack of memory(host:%(avail)s <= "
"instance:%(mem_inst)s)")
raise exception.MigrationError(reason=reason % locals())
def assert_compute_node_has_enough_disk(self, context,