diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-31 16:20:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-31 16:20:33 +0000 |
| commit | 0ea7a446fa861e22799f6a42d9ed6b89c8be2543 (patch) | |
| tree | 6e6360a8e9c20e4c52f9b25d2a8786bb13ead463 /nova/compute | |
| parent | 479a77ce56c935d10ae38dc30748ca9a546266ad (diff) | |
| parent | 8cf635b08a57a9e3be2bef980ef38cf857b6525a (diff) | |
Merge "Stop using scheduler RPC API magic"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index c39e588f3..e47147522 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1807,7 +1807,7 @@ class API(base.Base): LOG.debug(_("Going to try to live migrate instance"), instance=instance) self.scheduler_rpcapi.live_migration(context, block_migration, - disk_over_commit, instance, host, topic=FLAGS.compute_topic) + disk_over_commit, instance, host) class HostAPI(base.Base): |
