From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 2 Mar 2011 18:51:29 +0000 (+0100)
Subject: Fix resolv.conf.erb to work with no nameservers when we have a local recursor
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=a46da6bd7b246ce960c5bd1d484597b79c05521a

Fix resolv.conf.erb to work with no nameservers when we have a local recursor
---

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index cb493a9c..9bc11ba9 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -18,16 +18,16 @@ options += nodeinfo['hoster']['resolvoptions'] if nodeinfo['hoster']['resolvopti
 
 searchpaths << "debian.org"
 
-if nameservers.empty?
-  raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster"
-end
-
 resolvconf  = ''
 resolvconf += "search " + searchpaths.join(" ") + "\n"
 
 if runs_local_resolver
   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!"
+  end
+
   nameservers.each do |ns|
     resolvconf += "nameserver " + ns + "\n"
   end