summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-10 15:04:52 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-10 15:04:52 -0700
commitfc666c244a8de66ac73add034df3af2544a59790 (patch)
tree1687266ec6b343665c6a171e6044a80b42fbef7d
parenta5b6e1dc8f3aa3135f633daac2e489e5e6ee67cb (diff)
set dnsName on describe
-rw-r--r--nova/endpoint/cloud.py4
1 files changed, 1 insertions, 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'],