diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-02 18:24:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-02 18:24:37 +0000 |
| commit | f1a22ee83a75d966fd2112c3de79369321cea97f (patch) | |
| tree | 4f41c6b952622b62a697db51619e822c3b726537 /nova/api | |
| parent | 23f89c94ece474e130f53efbaaf8c1b9b3e9ef34 (diff) | |
| parent | 88acbe869a22075306999b095ba87a4069a3beac (diff) | |
Merge "Fix for EC2 API part of bug 897164"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index eb4945412..067c450b4 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1153,7 +1153,7 @@ class CloudController(object): floating_ip = ip_info['floating_ips'][0] if ip_info['fixed_ip6s']: i['dnsNameV6'] = ip_info['fixed_ip6s'][0] - i['privateDnsName'] = fixed_ip + i['privateDnsName'] = instance['hostname'] i['privateIpAddress'] = fixed_ip i['publicDnsName'] = floating_ip i['ipAddress'] = floating_ip or fixed_ip |