From 4c4c77925c5df36643b4f91cbe3b220e3551431e Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Thu, 19 Apr 2012 21:51:40 +0000 Subject: Remove unused time keyword arg It's not used anywhere, it aliases the imported time module and is broken at best if given since we want to use the eventlet sleep anyway (which is monkey patched into time.sleep) Change-Id: I7322ab5b5526afd3c02f48eb85066570b556bb75 --- nova/compute/manager.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index fd4b18c16..1e2fce695 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1870,7 +1870,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. @@ -1879,9 +1879,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) -- cgit