diff options
| author | Jimmy Bergman <jimmy@sigint.se> | 2011-04-21 15:23:36 +0200 |
|---|---|---|
| committer | Jimmy Bergman <jimmy@sigint.se> | 2011-04-21 15:23:36 +0200 |
| commit | ea11033935192ee26ea6d0d0dad47a0a624b17a0 (patch) | |
| tree | 9e8d3846fbf186aa566de61cce1bf4e2639f24bc | |
| parent | b22705208133e5ff848b41296c2eec7a7b4e15e6 (diff) | |
Add privateIpAddress and ipAddress to EC2 API DescribeInstances response.
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 4785d812a..4aa973290 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -726,7 +726,9 @@ class CloudController(object): instance['mac_address']) i['privateDnsName'] = fixed_addr + i['privateIpAddress'] = fixed_addr i['publicDnsName'] = floating_addr + i['ipAddress'] = floating_addr or fixed_addr i['dnsName'] = i['publicDnsName'] or i['privateDnsName'] i['keyName'] = instance['key_name'] |