diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-22 14:05:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-22 14:05:41 +0000 |
| commit | b07d3cd8ef1eb805e550edfa9ad14fcbe004c131 (patch) | |
| tree | d37f0588d8477fbadffee5d6ff97d7ba2d4f1acf | |
| parent | 2a45e769b0185a43daa933e9eddd4de30b07ec0a (diff) | |
| parent | 2622cffb2f935a0626b8de75360ce5d15f01758c (diff) | |
| download | nova-b07d3cd8ef1eb805e550edfa9ad14fcbe004c131.tar.gz nova-b07d3cd8ef1eb805e550edfa9ad14fcbe004c131.tar.xz nova-b07d3cd8ef1eb805e550edfa9ad14fcbe004c131.zip | |
Merge "poll_rebooting_instances passes an instance now."
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 4093c2f77..abb12ed6c 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -1186,7 +1186,7 @@ class VMOps(object): for instance in instances: LOG.info(_("Automatically hard rebooting %d"), instance.id) - self.compute_api.reboot(ctxt, instance.id, "HARD") + self.compute_api.reboot(ctxt, instance, "HARD") def poll_rescued_instances(self, timeout): """Look for expirable rescued instances. |