From fc666c244a8de66ac73add034df3af2544a59790 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Fri, 10 Sep 2010 15:04:52 -0700
Subject: set dnsName on describe

---
 nova/endpoint/cloud.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 925d14e16..6ca6855ca 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -391,9 +391,7 @@ class CloudController(object):
                     floating_addr = fixed['floating_ips'][0]['str_id']
             i['privateDnsName'] = fixed_addr
             i['publicDnsName'] = floating_addr
-            if not i['publicDnsName']:
-                i['publicDnsName'] = i['privateDnsName']
-            i['dnsName'] = None
+            i['dnsName'] = i['publicDnsName'] or i['privateDnsName']
             i['keyName'] = instance['key_name']
             if context.user.is_admin():
                 i['keyName'] = '%s (%s, %s)' % (i['keyName'],
-- 
cgit