Merge lp:~rlane/nova/lp705205 into lp:~hudson-openstack/nova/trunk

[Ryan Lane]

Fixes issue with instance creation throwing errors when non-default groups are used.

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-01-18 23:50:47 +0000
+++ nova/compute/api.py	2011-01-20 19:37:54 +0000
@@ -246,13 +246,16 @@
         # ..then we distill the security groups to which they belong..
         security_groups = set()
         for rule in security_group_rules:
-            security_groups.add(rule['parent_group_id'])
+            security_group = self.db.security_group_get(
+                                                    context,
+                                                    rule['parent_group_id'])
+            security_groups.add(security_group)
 
         # ..then we find the instances that are members of these groups..
         instances = set()
         for security_group in security_groups:
             for instance in security_group['instances']:
-                instances.add(instance['id'])
+                instances.add(instance)
 
         # ...then we find the hosts where they live...
         hosts = set()