diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-09-13 07:49:03 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-09-13 07:49:03 -0700 |
| commit | 8a9b192f5436fa53b58b713e193733ea677766cc (patch) | |
| tree | de2e3cb0deb0266feabd23485b033fd40f7a85b3 /nova/compute | |
| parent | 9ccefcaa44062f5aa2e562dd126e22d06a06c392 (diff) | |
| parent | 9f39ff070b5500a0ccb9a6454995f97342254381 (diff) | |
we're back
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 3 | ||||
| -rw-r--r-- | nova/compute/manager.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 7211c2cf0..4da79cd3c 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -202,7 +202,8 @@ class API(base.Base): self._check_injected_file_quota(context, injected_files) self._check_requested_networks(context, requested_networks) - (image_service, image_id) = nova.image.get_image_service(image_href) + (image_service, image_id) = nova.image.get_image_service(context, + image_href) image = image_service.show(context, image_id) config_drive_id = None diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0be12297f..7915830ec 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -322,7 +322,8 @@ class ComputeManager(manager.SchedulerDependentManager): # used by the image service. This should be refactored to be # consistent. image_href = instance['image_ref'] - image_service, image_id = nova.image.get_image_service(image_href) + image_service, image_id = nova.image.get_image_service(context, + image_href) image_meta = image_service.show(context, image_id) try: |