From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Mar 2011 12:34:53 +0000 (+0000)
Subject: Try to work without nameservers
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=79d3cf1d213060df3d8973984cd7f2c64fbfdd01;p=mirror%2Fdsa-puppet.git

Try to work without nameservers
---

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index f554d9412..4ba636767 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -25,7 +25,10 @@ if defined?(unbound) and unbound and unbound == "true"
   resolvconf += "nameserver 127.0.0.1\n"
 else
   if nameservers.empty?
-    raise Puppet::ParseError, "Something has gone wrong writing resolv.conf.  No nameservers to use!"
+    #raise Puppet::ParseError, "Something has gone wrong writing resolv.conf.  No nameservers to use!"
+    STDERR.put "Something has gone wrong writing resolv.conf.  No nameservers to use - using google's!"
+    nameservers << '8.8.8.8'
+    nameservers << '8.8.4.4'
   end
 
   nameservers.each do |ns|