~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/api/ec2/metadatarequesthandler.py

  • Committer: Vishvananda Ishaya
  • Date: 2010-12-22 20:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: vishvananda@gmail.com-20101222205953-j2j5t0qjwlcd0t2s
merge trunk and upgrade to cheetah templating

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
        cc = cloud.CloudController()
66
66
        meta_data = cc.get_metadata(req.remote_addr)
67
67
        if meta_data is None:
68
 
            logging.error('Failed to get metadata for ip: %s' %
 
68
            logging.error(_('Failed to get metadata for ip: %s') %
69
69
                          req.remote_addr)
70
70
            raise webob.exc.HTTPNotFound()
71
71
        data = self.lookup(req.path_info, meta_data)