Merge "EC2: fixed AttributeError when metadata is not found"

This commit is contained in:
Jenkins
2014-08-11 20:30:12 +00:00
committed by Gerrit Code Review

View File

@@ -206,8 +206,7 @@ class MetadataRequestHandler(wsgi.Application):
if meta_data is None:
LOG.error(_LE('Failed to get metadata for instance id: %s'),
instance_id)
if meta_data.instance['project_id'] != tenant_id:
elif meta_data.instance['project_id'] != tenant_id:
LOG.warn(_LW("Tenant_id %(tenant_id)s does not match tenant_id "
"of instance %(instance_id)s."),
{'tenant_id': tenant_id, 'instance_id': instance_id})