KeyError: u'name_label'

[Johannes Erdfelt]

If an instance is deleted but still on the host, then _cleanup_running_deleted_instances() can fail if the action is set to the default 'log':

Traceback (most recent call last):
  File "/usr/lib/python2.6/logging/__init__.py", line 776, in emit
    msg = self.format(record)
  File "/usr/lib/python2.6/logging/__init__.py", line 654, in format
    return fmt.format(record)
  File "/home/johannes/openstack/nova/trunk/nova/log.py", line 244, in format
    return logging.Formatter.format(self, record)
  File "/usr/lib/python2.6/logging/__init__.py", line 436, in format
    record.message = record.getMessage()
  File "/usr/lib/python2.6/logging/__init__.py", line 306, in getMessage
    msg = msg % self.args
KeyError: u'name_label'

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/5739

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/5739
Committed: http://github.com/openstack/nova/commit/c0974bf9dfdb990463b6c48ae93c5eb784d358e5
Submitter: Jenkins
Branch: master

commit c0974bf9dfdb990463b6c48ae93c5eb784d358e5
Author: Johannes Erdfelt <email address hidden>
Date: Fri Mar 23 16:45:13 2012 +0000

    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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: milestone-proposed
Review: https://review.openstack.org/6192

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/6192
Committed: http://github.com/openstack/nova/commit/fac46afed3774ad0bea83c19b3a8b8202cc9a141
Submitter: Jenkins
Branch: milestone-proposed

commit fac46afed3774ad0bea83c19b3a8b8202cc9a141
Author: Johannes Erdfelt <email address hidden>
Date: Fri Mar 23 16:45:13 2012 +0000

    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