diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-01 09:58:33 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-01 09:58:33 +0200 |
| commit | 8a9d5a425ddaa8d6defac6d5dda2545363b0bb56 (patch) | |
| tree | 326b0e0a47fa1576667e512b4c0508cabed82d50 /nova/api | |
| parent | af2f94944624de0a151356086f7a311c650187c1 (diff) | |
| parent | ddaaebb28649811d723f93a89ee46d69cc3ecabc (diff) | |
Merge lp:~anso/nova/ec2-security-groups
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index a6e5da155..df968aa25 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -260,7 +260,7 @@ class CloudController(object): g = {} g['groupDescription'] = group.description g['groupName'] = group.name - g['ownerId'] = context.user.id + g['ownerId'] = group.project_id g['ipPermissions'] = [] for rule in group.rules: r = {} @@ -272,7 +272,7 @@ class CloudController(object): if rule.group_id: source_group = db.security_group_get(context, rule.group_id) r['groups'] += [{'groupName': source_group.name, - 'userId': source_group.user_id}] + 'userId': source_group.project_id}] else: r['ipRanges'] += [{'cidrIp': rule.cidr}] g['ipPermissions'] += [r] |