diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-17 20:05:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-17 20:05:43 +0000 |
| commit | c5a0f0314818b63bdf2d5acb1c9407adab64ae6f (patch) | |
| tree | 9215a2c2105efb2e6930f19522864b22d01a3a9d | |
| parent | d40c75fa16e3a302a90c9edd29be6707012b21bd (diff) | |
| parent | 2b7d5c783a330fbf5a54cd5f63dbf5f1004c6103 (diff) | |
Merge "Revert to prior method of executing a libvirt hard_reboot."
| -rw-r--r-- | nova/virt/libvirt/driver.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 6abce222d..8d3a36405 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -876,12 +876,8 @@ class LibvirtDriver(driver.ComputeDriver): if not xml: xml = virt_dom.XMLDesc(0) - # NOTE(dprince): reset was added in Libvirt 0.9.7 - if hasattr(virt_dom, 'reset'): - virt_dom.reset(0) - else: - self._destroy(instance) - self._create_domain(xml, virt_dom) + self._destroy(instance) + self._create_domain(xml, virt_dom) def _wait_for_reboot(): """Called at an interval until the VM is running again.""" |