summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafi Khardalian <rafi@metacloud.com>2013-01-10 20:26:55 -0800
committerRafi Khardalian <rafi@metacloud.com>2013-01-10 20:28:33 -0800
commit038ca9b2ab78b3ea928687afe98eaefa138c5c37 (patch)
tree9449e85dbe73b6d1af58ec1dae1755dd3f6174c1
parentec120d52b57ad37f813f32a81ecc689a1bab6d56 (diff)
downloadnova-038ca9b2ab78b3ea928687afe98eaefa138c5c37.tar.gz
nova-038ca9b2ab78b3ea928687afe98eaefa138c5c37.tar.xz
nova-038ca9b2ab78b3ea928687afe98eaefa138c5c37.zip
Fix libvirt resume function call to get_domain_xml
Fixes bug 1098411 block_device_info was always being passed as None, which was a mistake I introduced with a prior patch. Change-Id: If4fe99e4716c193126b0a525378b51ea5801bdfe
-rw-r--r--nova/virt/libvirt/driver.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 66bd3bdaf..1e087e61a 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -967,8 +967,7 @@ class LibvirtDriver(driver.ComputeDriver):
@exception.wrap_exception()
def resume(self, instance, network_info, block_device_info=None):
"""resume the specified instance."""
- xml = self._get_domain_xml(instance, network_info,
- block_device_info=None)
+ xml = self._get_domain_xml(instance, network_info, block_device_info)
self._create_domain_and_network(xml, instance, network_info,
block_device_info)