summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Gandelman <adamg@canonical.com>2011-08-04 17:43:37 -0700
committerAdam Gandelman <adamg@canonical.com>2011-08-04 17:43:37 -0700
commitd470f82ea09214b6f535995aa551a23eb4ccc4ed (patch)
tree044c744e521f905a68b5a502344ec1599435cf1c
parent0fea610a6918089c53cc33335a4db4557820675f (diff)
downloadnova-d470f82ea09214b6f535995aa551a23eb4ccc4ed.tar.gz
nova-d470f82ea09214b6f535995aa551a23eb4ccc4ed.tar.xz
nova-d470f82ea09214b6f535995aa551a23eb4ccc4ed.zip
Properly format mapping['dns'] before handing off to template for injection (Fixes LP Bug #821203)
-rw-r--r--nova/virt/libvirt/connection.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index f7aae4112..0f0f62588 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -880,7 +880,7 @@ class LibvirtConnection(driver.ComputeDriver):
'netmask': netmask,
'gateway': mapping['gateway'],
'broadcast': mapping['broadcast'],
- 'dns': mapping['dns'],
+ 'dns': ' '.join(mapping['dns']),
'address_v6': address_v6,
'gateway6': gateway_v6,
'netmask_v6': netmask_v6}