summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-03-23 16:45:13 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-03-23 16:45:13 +0000
commitc0974bf9dfdb990463b6c48ae93c5eb784d358e5 (patch)
treea7c081c72a7e9ec40779ac86fb0e2a290d1d9016 /nova/compute
parent5c5a5fbaa03f1864b434bed47796b7b745a24442 (diff)
Use key in locals() that actually exists
Fixes bug 963263 Also, fix whitespace so we don't end up with two almost identical strings to internationalize Change-Id: I4c4faa0c335bdafca9426e2056113bb6f87abc3a
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index daffe0515..efe560911 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2453,8 +2453,9 @@ class ComputeManager(manager.SchedulerDependentManager):
with utils.temporary_mutation(context, read_deleted="yes"):
for instance in self._running_deleted_instances(context):
if action == "log":
- LOG.warning(_("Detected instance with name label "
- "'%(name_label)s' which is marked as "
+ name = instance['name']
+ LOG.warning(_("Detected instance with name label "
+ "'%(name)s' which is marked as "
"DELETED but still present on host."),
locals(), instance=instance)