diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-09-12 20:48:43 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-09-12 20:48:43 +0000 |
| commit | 79ef79abf24f7b8c8d3c9b652285a69fee7e9d14 (patch) | |
| tree | e98ac047eb52616eda118be617c4229dc4189f47 /nova/virt/xenapi_conn.py | |
| parent | 2351c06f50d4556e564a7b0abb1653805e661330 (diff) | |
| parent | 68551bb375588470b41606f181c445192c18cdaa (diff) | |
| download | nova-79ef79abf24f7b8c8d3c9b652285a69fee7e9d14.tar.gz | |
Merge with trunk
Diffstat (limited to 'nova/virt/xenapi_conn.py')
| -rw-r--r-- | nova/virt/xenapi_conn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py index 69a17f721a..46fdc107d3 100644 --- a/nova/virt/xenapi_conn.py +++ b/nova/virt/xenapi_conn.py @@ -203,9 +203,9 @@ class XenAPIConnection(driver.ComputeDriver): """ Create snapshot from a running VM instance """ self._vmops.snapshot(context, instance, image_id) - def reboot(self, instance, network_info): + def reboot(self, instance, network_info, reboot_type): """Reboot VM instance""" - self._vmops.reboot(instance) + self._vmops.reboot(instance, reboot_type) def set_admin_password(self, instance, new_pass): """Set the root/admin password on the VM instance""" |