diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-08 00:19:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-08 00:19:45 +0000 |
| commit | 148b34feefbaed561b1269c53320638fa71abfcf (patch) | |
| tree | 7e080780873fdba92d85c18346c455ada6147b4f /nova/compute | |
| parent | bce3806efec31fb0fa536b152d763b333d75120d (diff) | |
| parent | f0c9c85760605f0b7460d9bc08ac79487703a6fd (diff) | |
Merge "Recache or rebuild missing images on hard_reboot"
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x[-rw-r--r--] | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 60d72e565..bb4af94a6 100644..100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1483,7 +1483,8 @@ class ComputeManager(manager.SchedulerDependentManager): context=context, instance=instance) try: - self.driver.reboot(instance, self._legacy_nw_info(network_info), + self.driver.reboot(context, instance, + self._legacy_nw_info(network_info), reboot_type, block_device_info) except Exception, exc: LOG.error(_('Cannot reboot instance: %(exc)s'), locals(), |