diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-21 16:10:26 -0500 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-21 16:10:26 -0500 |
| commit | 09188c61d5359750f9deadcf912f0fa5fbf005b7 (patch) | |
| tree | 53006dc213fc28f8c74179516f109c93603f429a /nova/compute | |
| parent | 75f93d83be59a85b63a267dc22458a133c591f8e (diff) | |
| parent | ec60562b1a6d18e6df4024870468c0501dc692f9 (diff) | |
| download | nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.tar.gz nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.tar.xz nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.zip | |
Resolved trunk merge conflicts
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 45a8f2ce8..1d8b9d79f 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -249,13 +249,16 @@ class API(base.Base): # ..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() |