summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-02 08:11:03 +0000
committerGerrit Code Review <review@openstack.org>2012-11-02 08:11:03 +0000
commit82aec115bef8190986c4b6c36e007bd3546167ff (patch)
treebfde61190c29aa210d56435e59b8022785ac9a08 /nova/api
parent539107e1a6938f67efd8a0b12d8ee6e2ddd0e3f4 (diff)
parent358ccf5f196b6b43f18778afae279633c051c6d9 (diff)
Merge "Improve EC2 describe_security_groups performance"
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 20e68030f..3446b5a8f 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -457,7 +457,7 @@ class CloudController(object):
r['groups'] = []
r['ipRanges'] = []
if rule.group_id:
- source_group = db.security_group_get(context, rule.group_id)
+ source_group = rule.grantee_group
r['groups'] += [{'groupName': source_group.name,
'userId': source_group.project_id}]
if rule.protocol: