Finalizing the node handler. It now correctly uses the different node sources

and knows how to retrieve data from those sources.  Now I just need to fix
the language stuff to use this handler instead of the existing node stuff.

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/node_source/external.rb b/lib/puppet/node_source/external.rb
index 4af68d8ae..54111d924 100644
--- a/lib/puppet/node_source/external.rb
+++ b/lib/puppet/node_source/external.rb
@@ -1,4 +1,4 @@
-Puppet::Network::Handler::Node.newnode_source(:external) do
+Puppet::Network::Handler::Node.newnode_source(:external, :fact_merge => true) do
     desc "Call an external program to get node information."
 
     include Puppet::Util
@@ -33,7 +33,7 @@ Puppet::Network::Handler::Node.newnode_source(:external) do
             raise Puppet::Error, "Could not load external node results for %s: %s" % [name, detail]
         end
 
-        node = Puppet::Network::Handler::Node::SimpleNode.new(:name => name)
+        node = newnode(name)
         set = false
         [:parameters, :classes].each do |param|
             if value = result[param]
diff --git a/lib/puppet/node_source/ldap.rb b/lib/puppet/node_source/ldap.rb
index 6825f2b68..9332fcb40 100644
--- a/lib/puppet/node_source/ldap.rb
+++ b/lib/puppet/node_source/ldap.rb
@@ -1,4 +1,4 @@
-Puppet::Network::Handler::Node.newnode_source(:ldap) do
+Puppet::Network::Handler::Node.newnode_source(:ldap, :fact_merge => true) do
     desc "Search in LDAP for node configuration information."
 
     # Find the ldap node, return the class list and parent node specially,
@@ -113,6 +113,6 @@ Puppet::Network::Handler::Node.newnode_source(:ldap) do
             end
         end
 
-        return Puppet::Network::Handler::Node::SimpleNode.new(:name => node, :classes => classes, :source => "ldap", :parameters => parameters)
+        return newnode(node, :classes => classes, :source => "ldap", :parameters => parameters)
     end
 end