summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-09-14 15:00:26 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-09-14 15:00:26 +0000
commited0d8bfd0fd7bbe81dd5e39683ec3e90fc86c16c (patch)
tree3dbcaf19668c72e3226244eed89685de1f42fe92 /nova/compute
parent542ea00d6fd22253f50d8bd5fd5319aa42ba9e04 (diff)
parent7f1a0a05ec32ecb07c3a5f2286f841c4abc8f5e0 (diff)
Merge with trunk
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 1f4ce3165..ba314efb6 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1109,7 +1109,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,