diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-12 14:29:06 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-12 14:29:06 -0400 |
| commit | d5c4be43c60bcd5fa0fae130ad41f847e28d84fe (patch) | |
| tree | b8820ec4b9c127a5a63e1ec60b19db9e9e830cdc /nova/api | |
| parent | 0611e3fc3165ce916d83b0fa421e6dafa2b2387e (diff) | |
| parent | 9482275a60ab8caa546ec402f61c60b9f5e7e33f (diff) | |
| download | nova-d5c4be43c60bcd5fa0fae130ad41f847e28d84fe.tar.gz nova-d5c4be43c60bcd5fa0fae130ad41f847e28d84fe.tar.xz nova-d5c4be43c60bcd5fa0fae130ad41f847e28d84fe.zip | |
merging parent branch lp:~rackspace-titan/nova/glance-client-keystone
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/auth.py | 1 | ||||
| -rw-r--r-- | nova/api/openstack/create_instance_helper.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py index cd0d38b3f..f73cae01e 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -70,6 +70,7 @@ class KeystoneContext(wsgi.Middleware): project_id, roles=roles, auth_token=auth_token, + strategy='keystone', remote_address=remote_address) req.environ['nova.context'] = ctx diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py index 67e669c17..e27ddf78b 100644 --- a/nova/api/openstack/create_instance_helper.py +++ b/nova/api/openstack/create_instance_helper.py @@ -92,7 +92,8 @@ class CreateInstanceHelper(object): if str(image_href).startswith(req.application_url): image_href = image_href.split('/').pop() try: - image_service, image_id = nova.image.get_image_service(image_href) + image_service, image_id = nova.image.get_image_service(context, + image_href) kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image( req, image_service, image_id) images = set([str(x['id']) for x in image_service.index(context)]) |