summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2012-03-06 16:28:00 +0000
committerAlex Meade <alex.meade@rackspace.com>2012-03-06 16:28:00 +0000
commitb425676da955b13dd033db6ac67ba1bb7dcf28c8 (patch)
treeb4e7234992d0b95c7633d5b657e9b194d35fa919
parentc16cd04cf61fc6411fe953e1653385d62ca1ab82 (diff)
downloadnova-b425676da955b13dd033db6ac67ba1bb7dcf28c8.tar.gz
nova-b425676da955b13dd033db6ac67ba1bb7dcf28c8.tar.xz
nova-b425676da955b13dd033db6ac67ba1bb7dcf28c8.zip
Fixing incorrect use of instance keyword in logging.
Fixes bug 948154 Change-Id: I8adc48482c26528d1e671c8e038c23caaa0f861d
-rw-r--r--nova/compute/manager.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 52f94d41c..73fceb2f4 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -393,14 +393,14 @@ class ComputeManager(manager.SchedulerDependentManager):
try:
self.terminate_instance(context, instance_uuid)
except exception.InstanceNotFound:
- LOG.info(_("Instance already deleted from database. "
- "Attempting forceful vm deletion"),
- instance=instance_uuid)
+ LOG.info(_("Instance %s already deleted from database. "
+ "Attempting forceful vm deletion")
+ % instance_uuid)
ctxt = nova.context.get_admin_context(read_deleted='yes')
self.terminate_instance(ctxt, instance_uuid)
except Exception as ex:
LOG.exception(_("Exception encountered while terminating the "
- "instance"), instance=instance_uuid)
+ "instance %s") % instance_uuid)
def _run_instance(self, context, instance_uuid,
requested_networks=None,