diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | Authors | 2 | ||||
| -rw-r--r-- | nova/api/ec2/__init__.py | 4 | ||||
| -rw-r--r-- | nova/api/ec2/cloud.py | 5 |
4 files changed, 10 insertions, 2 deletions
@@ -18,6 +18,7 @@ <corywright@gmail.com> <cory.wright@rackspace.com> <dan@nicira.com> <danwent@dan-xs3-cs> <dan@nicira.com> <danwent@gmail.com> +<Dave.Walker@canonical.com> <DaveWalker@ubuntu.com> <derekh@redhat.com> <higginsd@gmail.com> <devin.carlen@gmail.com> <devcamcar@illian.local> <dprince@redhat.com> <dan.prince@rackspace.com> @@ -40,7 +40,7 @@ Dan Prince <dprince@redhat.com> Dan Wendlandt <dan@nicira.com> Daniel P. Berrange <berrange@redhat.com> Dave Lapsley <dlapsley@nicira.com> -Dave Walker <DaveWalker@ubuntu.com> +Dave Walker <Dave.Walker@canonical.com> David Pravec <David.Pravec@danix.org> David Subiros <david.perez5@hp.com> Dean Troyer <dtroyer@gmail.com> diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 87fea6b2cc..6566ab7a92 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -56,6 +56,10 @@ ec2_opts = [ cfg.StrOpt('keystone_ec2_url', default='http://localhost:5000/v2.0/ec2tokens', help='URL to get token from ec2 request.'), + cfg.BoolOpt('ec2_private_dns_show_ip', + default=False, + help='Return the IP address as private dns hostname in ' + 'describe instances'), ] FLAGS = flags.FLAGS diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 352ba02a5d..5240af0163 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1148,7 +1148,10 @@ class CloudController(object): floating_ip = ip_info['floating_ips'][0] if ip_info['fixed_ip6s']: i['dnsNameV6'] = ip_info['fixed_ip6s'][0] - i['privateDnsName'] = instance['hostname'] + if FLAGS.ec2_private_dns_show_ip: + i['privateDnsName'] = fixed_ip + else: + i['privateDnsName'] = instance['hostname'] i['privateIpAddress'] = fixed_ip i['publicDnsName'] = floating_ip i['ipAddress'] = floating_ip or fixed_ip |