diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-14 04:03:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-14 04:03:12 +0000 |
| commit | 497b42372d820bb9bf2c9dfd482e5abf9ef1f940 (patch) | |
| tree | 503ee6c8e368e6b4bf3dcbd84132ffbabe2481be /nova/compute | |
| parent | 059a05d6cc241ad38a0204d8782b7debf4e823d2 (diff) | |
| parent | 188f306aa88a6a5b73959c74f1642720d7627789 (diff) | |
| download | nova-497b42372d820bb9bf2c9dfd482e5abf9ef1f940.tar.gz nova-497b42372d820bb9bf2c9dfd482e5abf9ef1f940.tar.xz nova-497b42372d820bb9bf2c9dfd482e5abf9ef1f940.zip | |
Merge "Make compute/manager use conductor for unrescue()"
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | 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 87338f494..9c11ce1f7 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3482,7 +3482,7 @@ class ComputeManager(manager.SchedulerDependentManager): to_unrescue.append(instance) for instance in to_unrescue: - self.compute_api.unrescue(context, instance) + self.conductor_api.compute_unrescue(context, instance) @manager.periodic_task def _poll_unconfirmed_resizes(self, context): |