summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 5aed2c677..86d375b9e 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -54,6 +54,7 @@ from nova import utils
from nova import volume
from nova.compute import power_state
from nova.compute.utils import terminate_volumes
+from nova.notifier import api as notifier
from nova.virt import driver
@@ -111,6 +112,10 @@ def checks_instance_lock(function):
return decorated_function
+def publisher_id(host=None):
+ return notifier.publisher_id("compute", host)
+
+
class ComputeManager(manager.SchedulerDependentManager):
"""Manages the running instances from creation to destruction."""
@@ -1158,7 +1163,7 @@ class ComputeManager(manager.SchedulerDependentManager):
{"method": "pre_live_migration",
"args": {'instance_id': instance_id}})
- except Exception:
+ except Exception, e:
msg = _("Pre live migration for %(i_name)s failed at %(dest)s")
LOG.error(msg % locals())
self.recover_live_migration(context, instance_ref)