~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/api/cloudpipe/__init__.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:
45
45
    def __call__(self, req):
46
46
        if req.method == 'POST':
47
47
            return self.sign_csr(req)
48
 
        _log.debug("Cloudpipe path is %s" % req.path_info)
 
48
        _log.debug(_("Cloudpipe path is %s") % req.path_info)
49
49
        if req.path_info.endswith("/getca/"):
50
50
            return self.send_root_ca(req)
51
51
        return webob.exc.HTTPNotFound()
56
56
        return instance['project_id']
57
57
 
58
58
    def send_root_ca(self, req):
59
 
        _log.debug("Getting root ca")
 
59
        _log.debug(_("Getting root ca"))
60
60
        project_id = self.get_project_id_from_ip(req.remote_addr)
61
61
        res = webob.Response()
62
62
        res.headers["Content-Type"] = "text/plain"