summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-11-11 11:37:03 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-11-16 12:26:07 -0800
commitb6644ffe4360a9d55e138e20e0d453e8ffb2c718 (patch)
tree9949e8a17700f98fbd20125d67e8e34684dca51e /nova/api
parent57ad4de6487f625a9e39b17ba612b6f1b43e937c (diff)
downloadnova-b6644ffe4360a9d55e138e20e0d453e8ffb2c718.tar.gz
nova-b6644ffe4360a9d55e138e20e0d453e8ffb2c718.tar.xz
nova-b6644ffe4360a9d55e138e20e0d453e8ffb2c718.zip
Make run instances respect availability zone
* includes test * fixes bug 888918 Change-Id: I40985e9dcc153fae53675f3da5e2d5b5763cfca3
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 5a5b7e1d8..54736f3b3 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -1464,7 +1464,7 @@ class CloudController(object):
user_data=kwargs.get('user_data'),
security_group=kwargs.get('security_group'),
availability_zone=kwargs.get('placement', {}).get(
- 'AvailabilityZone'),
+ 'availability_zone'),
block_device_mapping=kwargs.get('block_device_mapping', {}))
return self._format_run_instances(context, resv_id)