diff options
Diffstat (limited to 'lib/puppet/network/handler/configuration.rb')
| -rw-r--r-- | lib/puppet/network/handler/configuration.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb index 2c72d3d2b..2df1b3ab4 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 = node_handler.details(key) + unless node = Puppet::Node.search(key) raise Puppet::Error, "Could not find node '%s'" % key end @@ -64,7 +64,7 @@ class Puppet::Network::Handler # Return the configuration version. def version(client = nil, clientip = nil) - if client and node = node_handler.details(client) + if client and node = Puppet::Node.search(client) update_node_check(node) return interpreter.configuration_version(node) else @@ -79,7 +79,7 @@ class Puppet::Network::Handler # Add any extra data necessary to the node. def add_node_data(node) # Merge in our server-side facts, so they can be used during compilation. - node.fact_merge(@server_facts) + node.merge(@server_facts) # Add any specified classes to the node's class list. if classes = @options[:Classes] @@ -159,14 +159,6 @@ class Puppet::Network::Handler @interpreter 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 - # Initialize our server fact hash; we add these to each client, and they # won't change while we're running, so it's safe to cache the values. def set_server_facts |