summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/handler
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-12-10 21:13:48 -0600
committerLuke Kanies <luke@madstop.com>2007-12-10 21:13:48 -0600
commitf127d04934b679b3e5edd7f55d31342abce3c96e (patch)
treebb8bc15e086b473bc27104cd6fcbbf548a68678e /lib/puppet/network/handler
parent7a4ae082c216d68092f140ed1f5cca40ffb1a09e (diff)
downloadpuppet-f127d04934b679b3e5edd7f55d31342abce3c96e.tar.gz
puppet-f127d04934b679b3e5edd7f55d31342abce3c96e.tar.xz
puppet-f127d04934b679b3e5edd7f55d31342abce3c96e.zip
Fixing #951 -- external nodes work again, but you have to
set the 'node_terminus' setting to 'exec'.
Diffstat (limited to 'lib/puppet/network/handler')
-rw-r--r--lib/puppet/network/handler/configuration.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb
index 680304e2a..8168ce1d5 100644
--- a/lib/puppet/network/handler/configuration.rb
+++ b/lib/puppet/network/handler/configuration.rb
@@ -30,7 +30,7 @@ class Puppet::Network::Handler
# Note that this is reasonable, because either their node source should actually
# know about the node, or they should be using the ``none`` node source, which
# will always return data.
- unless node = Puppet::Node.search(key)
+ unless node = Puppet::Node.find_by_any_name(key)
raise Puppet::Error, "Could not find node '%s'" % key
end
@@ -62,7 +62,7 @@ class Puppet::Network::Handler
# Return the configuration version.
def version(client = nil, clientip = nil)
- if client and node = Puppet::Node.search(client)
+ if client and node = Puppet::Node.find_by_any_name(client)
update_node_check(node)
return interpreter.configuration_version(node)
else