diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-02 15:59:52 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-02 15:59:52 -0400 |
| commit | 59adf260b59dcdcc6bc2df3260a331a4a05f535c (patch) | |
| tree | 37bcc8eccb9f6e48f557e27f661d9c019df32b7c /nova/cloudpipe | |
| parent | 43f1e722b633945a8f5dca005e6fd60515bac4ae (diff) | |
| download | nova-59adf260b59dcdcc6bc2df3260a331a4a05f535c.tar.gz nova-59adf260b59dcdcc6bc2df3260a331a4a05f535c.tar.xz nova-59adf260b59dcdcc6bc2df3260a331a4a05f535c.zip | |
Move nova.endpoint.images to api.ec2 and delete nova.endpoint
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 2867bcb21..97272eda6 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -32,7 +32,7 @@ from nova import exception from nova import flags from nova import utils from nova.auth import manager -from nova.endpoint import api +from nova.api.ec2 import context FLAGS = flags.FLAGS @@ -60,7 +60,7 @@ class CloudPipe(object): key_name = self.setup_keypair(project.project_manager_id, project_id) zippy = open(zippath, "r") - context = api.APIRequestContext(handler=None, user=project.project_manager, project=project) + context = context.APIRequestContext(user=project.project_manager, project=project) reservation = self.controller.run_instances(context, # run instances expects encoded userdata, it is decoded in the get_metadata_call |