summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2012-02-05 19:51:17 -0800
committerJustin Santa Barbara <justin@fathomdb.com>2012-02-05 19:51:17 -0800
commit1a32aad3a61deaadff7972689319c78fd16deb86 (patch)
tree3631649d389a96a6d0ed6f743917df4b46fe6b97
parente9fd01e58b6a83b400ce9825f2543cb6ef476f00 (diff)
Don't write a dns directive if there are no dns records in /etc/network/interfaces
Change-Id: I26e22f37f91bf242aa573c91b26b2304fdd25751
-rw-r--r--nova/virt/interfaces.template2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/virt/interfaces.template b/nova/virt/interfaces.template
index ad8c1bcdb..e75c37357 100644
--- a/nova/virt/interfaces.template
+++ b/nova/virt/interfaces.template
@@ -14,7 +14,9 @@ iface ${ifc.name} inet static
netmask ${ifc.netmask}
broadcast ${ifc.broadcast}
gateway ${ifc.gateway}
+#if $ifc.dns
dns-nameservers ${ifc.dns}
+#end if
#if $use_ipv6
iface ${ifc.name} inet6 static