diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-05-26 10:34:17 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-05-26 10:34:17 -0400 |
| commit | 131d5bcae4e5f0ab48369e2979f16468bd0900a4 (patch) | |
| tree | 275c7f9066fd7d01830aa2a529e7c87745ad54ad /nova/api | |
| parent | 6b0334ecbec8067f97ec936d7969738681a0e7e6 (diff) | |
Switch the run_instances call in the EC2 back to 'image_id'. Incoming
requests use 'imageId' so we shouldn't modify this for image HREF's.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index ed33e2d42..cc2e140b0 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -849,7 +849,7 @@ class CloudController(object): instances = self.compute_api.create(context, instance_type=instance_types.get_instance_type_by_name( kwargs.get('instance_type', None)), - image_href=self._get_image(context, kwargs['image_href'])['id'], + image_id=self._get_image(context, kwargs['image_id'])['id'], min_count=int(kwargs.get('min_count', max_count)), max_count=max_count, kernel_id=kwargs.get('kernel_id'), |