diff options
| author | Eric Day <eday@oddments.org> | 2010-09-23 11:21:14 -0700 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-09-23 11:21:14 -0700 |
| commit | c9ac49b2425b932f60a87da80887d4556806ca60 (patch) | |
| tree | 6be7414465064ad2af95ac84c80e7ba636fbcfd2 | |
| parent | 54122c0a156d1562be76dfde41bd62006f9ed426 (diff) | |
| download | nova-c9ac49b2425b932f60a87da80887d4556806ca60.tar.gz nova-c9ac49b2425b932f60a87da80887d4556806ca60.tar.xz nova-c9ac49b2425b932f60a87da80887d4556806ca60.zip | |
Fixed cloudpipe lib init.
| -rw-r--r-- | nova/api/cloudpipe/__init__.py | 1 | ||||
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/cloudpipe/__init__.py b/nova/api/cloudpipe/__init__.py index 642f8ef6c..6d40990a8 100644 --- a/nova/api/cloudpipe/__init__.py +++ b/nova/api/cloudpipe/__init__.py @@ -51,6 +51,7 @@ class API(wsgi.Application): return webob.exc.HTTPNotFound() def get_project_id_from_ip(self, ip): + # TODO(eday): This was removed with the ORM branch, fix! instance = self.controller.get_instance_by_ip(ip) return instance['project_id'] diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index abc14bbb6..706a175d9 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -32,6 +32,7 @@ from nova import exception from nova import flags from nova import utils from nova.auth import manager +# TODO(eday): Eventually changes these to something not ec2-specific from nova.api.ec2 import cloud from nova.api.ec2 import context @@ -43,7 +44,7 @@ flags.DEFINE_string('boot_script_template', class CloudPipe(object): - def __init__(self, cloud_controller): + def __init__(self): self.controller = cloud.CloudController() self.manager = manager.AuthManager() |