diff options
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/virt/driver.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6a0251a15..fb6d900e2 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1378,7 +1378,7 @@ class ComputeManager(manager.SchedulerDependentManager): try: network_info = self._get_instance_nw_info(context, instance_ref) except Exception, error: - with utils.save_and_reraise_exception(): + with excutils.save_and_reraise_exception(): msg = _('%s. Setting instance vm_state to ERROR') LOG.error(msg % error) self._set_instance_error_state(context, instance_uuid) diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 1a7326675..57f7940ad 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -23,8 +23,6 @@ Driver base-classes: """ from nova.compute import power_state -from nova import context as nova_context -from nova import db from nova import flags from nova import log as logging |