summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorIlya Alekseyev <ialekseev@griddynamics.com>2010-12-24 21:05:45 +0300
committerIlya Alekseyev <ialekseev@griddynamics.com>2010-12-24 21:05:45 +0300
commit43f59fc025b4decd02a78acbfd0cf654bc9cf0db (patch)
treea9b298b20dd65063ce78134e986618c5976d29eb /nova/api
parent57ead438d06dd5c6e98e971670f397bed5d7e29c (diff)
adding zones to api
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index e09261f00..66060bbfc 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -753,6 +753,10 @@ class CloudController(object):
def run_instances(self, context, **kwargs):
max_count = int(kwargs.get('max_count', 1))
+ placement = kwargs.get('placement')
+ avzone = None
+ if placement is not None:
+ avzone = placement['availability_zone']
instances = self.compute_api.create_instances(context,
instance_types.get_by_type(kwargs.get('instance_type', None)),
kwargs['image_id'],
@@ -765,7 +769,8 @@ class CloudController(object):
key_name=kwargs.get('key_name'),
user_data=kwargs.get('user_data'),
security_group=kwargs.get('security_group'),
- generate_hostname=internal_id_to_ec2_id)
+ generate_hostname=internal_id_to_ec2_id,
+ availability_zone=avzone)
return self._format_run_instances(context,
instances[0]['reservation_id'])