diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-24 21:17:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-24 21:17:54 +0000 |
| commit | 0364b173f9c2638b99619c29ada704a483626e4b (patch) | |
| tree | 98a8ceb9207036a26b4bb00f97fdbf57a7dc9fbe | |
| parent | 113880fe1634c78b1b41f2cbb3af3ebccf3727cc (diff) | |
| parent | cf066f45307731660da03207486f28da33de7be2 (diff) | |
| download | nova-0364b173f9c2638b99619c29ada704a483626e4b.tar.gz nova-0364b173f9c2638b99619c29ada704a483626e4b.tar.xz nova-0364b173f9c2638b99619c29ada704a483626e4b.zip | |
Merge "Fix double reboot during resume_state_on_host_boot"
| -rw-r--r-- | nova/virt/libvirt/driver.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 7439ad40a..c113c9ae2 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -966,11 +966,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']): |