diff options
| author | Jimmy Bergman <jimmy@sigint.se> | 2011-04-21 22:13:47 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-04-21 22:13:47 +0000 |
| commit | 72539d1100c178b4f573196e02e249267871ffa6 (patch) | |
| tree | b7860037f6710023cb8e236240ce7b784fd44bcf /nova/api | |
| parent | 7bbfc3d771d807cb072325f656a7febf1d38459a (diff) | |
| parent | ea11033935192ee26ea6d0d0dad47a0a624b17a0 (diff) | |
Adapt DescribeInstances to EC2 API spec.
Diffstat (limited to 'nova/api')
| -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 1b70032a9..0e74089be 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'] |