diff options
| author | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-07-29 21:58:27 +0000 |
|---|---|---|
| committer | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-07-29 21:58:27 +0000 |
| commit | fc2682bc9c01c445b9ee7003c5cb561c452757e5 (patch) | |
| tree | 0bc94df9fb2409a3ce407ed8ae41bf41d5899bce /nova/compute | |
| parent | 649b0da35dbc36ce15cd3ada6e4e4b814a244158 (diff) | |
Revert to using context; to avoid conflict, we import context module as nova_context; add context to rescue
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 56331f86b..cf4ee229d 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -660,7 +660,7 @@ class ComputeManager(manager.SchedulerDependentManager): _update_state = lambda result: self._update_state_callback( self, context, instance_id, result) network_info = self._get_instance_nw_info(context, instance_ref) - self.driver.rescue(instance_ref, _update_state, network_info) + self.driver.rescue(context, instance_ref, _update_state, network_info) self._update_state(context, instance_id) @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) |