From cf066f45307731660da03207486f28da33de7be2 Mon Sep 17 00:00:00 2001 From: Rafi Khardalian Date: Tue, 22 Jan 2013 12:59:41 -0800 Subject: Fix double reboot during resume_state_on_host_boot Re-basing my commit introduced a mistake I did not catch before the merge occurred. resume_state_on_host_boot is calling both _create_domain_and_network followed by _hard_reboot. It should only call _hard_reboot. Change-Id: I52be2c0d0c85abe6386842c980f26b3c5713e3e3 --- nova/virt/libvirt/driver.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 8f260ba74..1e36e3094 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -964,11 +964,6 @@ class LibvirtDriver(driver.ComputeDriver): def resume_state_on_host_boot(self, context, instance, network_info, block_device_info=None): """resume guest state when a host is booted.""" - xml = self._get_existing_domain_xml(instance, network_info, - block_device_info) - self._create_domain_and_network(xml, instance, network_info, - block_device_info) - # Check if the instance is running already and avoid doing # anything if it is. if self.instance_exists(instance['name']): -- cgit