diff options
| author | Eric Day <eday@oddments.org> | 2010-09-23 13:18:40 -0700 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-09-23 13:18:40 -0700 |
| commit | 2b30ffe2f3c79e3701487d18fe1d4eef671aa335 (patch) | |
| tree | de5d48399b3339e7524628d4e7bfdb87e23b63c4 /nova | |
| parent | a6954efa3155868d31163236aa9e44f693f51b30 (diff) | |
| download | nova-2b30ffe2f3c79e3701487d18fe1d4eef671aa335.tar.gz nova-2b30ffe2f3c79e3701487d18fe1d4eef671aa335.tar.xz nova-2b30ffe2f3c79e3701487d18fe1d4eef671aa335.zip | |
Applied vish's fixes.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/metadatarequesthandler.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py index 229e5a78d..08a8040ca 100644 --- a/nova/api/ec2/metadatarequesthandler.py +++ b/nova/api/ec2/metadatarequesthandler.py @@ -18,6 +18,8 @@ """Metadata request handler.""" +import logging + import webob.dec import webob.exc @@ -63,9 +65,9 @@ class MetadataRequestHandler(object): cc = cloud.CloudController() meta_data = cc.get_metadata(req.remote_addr) if meta_data is None: - _log.error('Failed to get metadata for ip: %s' % req.remote_addr) + logging.error('Failed to get metadata for ip: %s' % req.remote_addr) raise webob.exc.HTTPNotFound() - data = self.lookup(path, meta_data) + data = self.lookup(req.path_info, meta_data) if data is None: raise webob.exc.HTTPNotFound() return self.print_data(data) |