Merge lp:~eday/nova/endpoint-cleanup into lp:~gundlach/nova/controllers-in-api

looks fine so far

=== modified file 'nova/api/ec2/metadatarequesthandler.py'
--- nova/api/ec2/metadatarequesthandler.py 2010-09-22 23:11:04 +0000
+++ nova/api/ec2/metadatarequesthandler.py 2010-09-23 02:12:45 +0000
@@ -18,6 +18,7 @@

 """Metadata request handler."""

+import logging
 import webob.dec
 import webob.exc

@@ -63,9 +64,9 @@
         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)

a couple of typos fixed and it works

In CloudPipe class, in __init__, cloud_controller is passed in but is not referenced. Looks like it can just go away.

208 class CloudPipe(object):
209 def __init__(self, cloud_controller):
210 - self.controller = cloud_controller
211 + self.controller = cloud.CloudController()
212 self.manager = manager.AuthManager()