diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-09-12 00:16:49 -0700 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-09-12 00:16:49 -0700 |
| commit | 7ac94ccf7dbb5838ef877b9d954ea96bf1412b4b (patch) | |
| tree | 1c826651f4fae984a31245360234c54f01b9fbe0 | |
| parent | 66dd77887641f9db5f690f871b0cfb4d381d6a3e (diff) | |
| download | nova-7ac94ccf7dbb5838ef877b9d954ea96bf1412b4b.tar.gz nova-7ac94ccf7dbb5838ef877b9d954ea96bf1412b4b.tar.xz nova-7ac94ccf7dbb5838ef877b9d954ea96bf1412b4b.zip | |
fix for lp847604 to unbreak instance rebooting
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index b0ea044c5..48bb266b7 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1049,7 +1049,7 @@ class API(base.Base): vm_state=vm_states.ACTIVE, task_state=task_states.REBOOTING) self._cast_compute_message('reboot_instance', context, instance_id, - reboot_type) + params={'reboot_type': reboot_type}) @scheduler_api.reroute_compute("rebuild") def rebuild(self, context, instance_id, image_href, admin_password, diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 19cef5ad7..fb2aed651 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -466,7 +466,7 @@ class LibvirtConnection(driver.ComputeDriver): shutil.rmtree(temp_dir) @exception.wrap_exception() - def reboot(self, instance, network_info): + def reboot(self, instance, network_info, reboot_type): """Reboot a virtual machine, given an instance reference. This method actually destroys and re-creates the domain to ensure the |