diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-06 14:47:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-06 14:47:03 +0000 |
| commit | 24b934f7f04903f3faba1785ae6deb6f2ada7dbd (patch) | |
| tree | 5b2e08dd7fb33996f42ce76f62b82ca81b94f6f0 /nova | |
| parent | 97c10efe75288b933d75f7a2e8d3241598d05c32 (diff) | |
| parent | 1a32aad3a61deaadff7972689319c78fd16deb86 (diff) | |
| download | nova-24b934f7f04903f3faba1785ae6deb6f2ada7dbd.tar.gz nova-24b934f7f04903f3faba1785ae6deb6f2ada7dbd.tar.xz nova-24b934f7f04903f3faba1785ae6deb6f2ada7dbd.zip | |
Merge "Don't write a dns directive if there are no dns records in /etc/network/interfaces"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/interfaces.template | 2 |
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 |