diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-23 13:59:33 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-23 13:59:33 +0200 |
| commit | fed57c47da49a0457fce8fec3b59c9142e62785e (patch) | |
| tree | 535c41033e00e1f12062bcdd4c7c14727093ff02 /nova | |
| parent | 20691ddc29f6808652a4dd537037f464e1f869fe (diff) | |
Address Vishy's comments.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/cloud.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 046aee14a..0f0aa327c 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -725,9 +725,9 @@ class CloudController(object): security_groups = [] for security_group_name in security_group_arg: - group = db.security_group_get_by_project(context, - context.project.id, - security_group_name) + group = db.security_group_get_by_name(context, + context.project.id, + security_group_name) security_groups.append(group['id']) reservation_id = utils.generate_uid('r') @@ -744,6 +744,7 @@ class CloudController(object): base_options['user_data'] = kwargs.get('user_data', '') type_data = INSTANCE_TYPES[instance_type] + base_options['instance_type'] = instance_type base_options['memory_mb'] = type_data['memory_mb'] base_options['vcpus'] = type_data['vcpus'] base_options['local_gb'] = type_data['local_gb'] |