diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-24 16:27:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-24 16:27:09 +0000 |
| commit | 2c786ff3ad0d3fa85735d98f9927e9f92b686edb (patch) | |
| tree | 2df143990fd720867fe7dd61a2556042b9df5756 /nova/compute | |
| parent | f05841caf3dbf7e659b55513f07e9837b1cf22f6 (diff) | |
| parent | 4c4c77925c5df36643b4f91cbe3b220e3551431e (diff) | |
Merge "Remove unused time keyword arg"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6ade886a1..edc241206 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1881,7 +1881,7 @@ class ComputeManager(manager.SchedulerDependentManager): """ return self.driver.get_instance_disk_info(instance_name) - def pre_live_migration(self, context, instance_id, time=None, + def pre_live_migration(self, context, instance_id, block_migration=False, disk=None): """Preparations for live migration at dest host. @@ -1890,9 +1890,6 @@ class ComputeManager(manager.SchedulerDependentManager): :param block_migration: if true, prepare for block migration """ - if not time: - time = greenthread - # Getting instance info instance_ref = self.db.instance_get(context, instance_id) |