diff options
Diffstat (limited to 'lib/puppet/network/handler/fileserver.rb')
| -rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index a429412d2..ae0e6553d 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -243,7 +243,10 @@ class Puppet::Network::Handler # the modules. def modules_mount(module_name, client) # Find our environment, if we have one. - if node = node_handler.details(client || Facter.value("hostname")) + unless hostname = (client || Facter.value("hostname")) + raise ArgumentError, "Could not find hostname" + end + if node = Puppet::Node.find(hostname) env = node.environment else env = nil @@ -258,14 +261,6 @@ class Puppet::Network::Handler end end - # Create a node handler instance for looking up our nodes. - def node_handler - unless defined?(@node_handler) - @node_handler = Puppet::Network::Handler.handler(:node).create - end - @node_handler - end - # Read the configuration file. def readconfig(check = true) return if @noreadconfig @@ -455,7 +450,7 @@ class Puppet::Network::Handler def getfileobject(dir, links) unless FileTest.exists?(dir) - self.notice "File source %s does not exist" % dir + self.debug "File source %s does not exist" % dir return nil end |