From aab419b8c1ad84e51c6f58839290bbe5d1e7b28b Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Tue, 14 Aug 2007 00:09:49 -0500
Subject: An intermediate commit in the work towards adding multi-environment
 support.

This has required splitting the interpreter up considerably, which is much
cleaner but is a large project.  There is now a 'nodes' handler, but it is
currently non-functional, although all the support structure is there.  It just
needs to have the individual methods fleshed out, and it needs to be connected
to the 'facts' handler.
---
 lib/puppet/node_source/external.rb | 51 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 lib/puppet/node_source/external.rb

(limited to 'lib/puppet/node_source/external.rb')

diff --git a/lib/puppet/node_source/external.rb b/lib/puppet/node_source/external.rb
new file mode 100644
index 000000000..4af68d8ae
--- /dev/null
+++ b/lib/puppet/node_source/external.rb
@@ -0,0 +1,51 @@
+Puppet::Network::Handler::Node.newnode_source(:external) do
+    desc "Call an external program to get node information."
+
+    include Puppet::Util
+    # Look for external node definitions.
+    def nodesearch(name)
+        return nil unless Puppet[:external_nodes] != "none"
+  
+        # This is a very cheap way to do this, since it will break on
+        # commands that have spaces in the arguments.  But it's good
+        # enough for most cases.
+        external_node_command = Puppet[:external_nodes].split
+        external_node_command << name
+        begin
+            output = Puppet::Util.execute(external_node_command)
+        rescue Puppet::ExecutionFailure => detail
+            if $?.exitstatus == 1
+                return nil
+            else
+                Puppet.err "Could not retrieve external node information for %s: %s" % [name, detail]
+            end
+            return nil
+        end
+        
+        if output =~ /\A\s*\Z/ # all whitespace
+            Puppet.debug "Empty response for %s from external node source" % name
+            return nil
+        end
+
+        begin
+            result = YAML.load(output).inject({}) { |hash, data| hash[symbolize(data[0])] = data[1]; hash }
+        rescue => detail
+            raise Puppet::Error, "Could not load external node results for %s: %s" % [name, detail]
+        end
+
+        node = Puppet::Network::Handler::Node::SimpleNode.new(:name => name)
+        set = false
+        [:parameters, :classes].each do |param|
+            if value = result[param]
+                node.send(param.to_s + "=", value)
+                set = true
+            end
+        end
+
+        if set
+            return node
+        else
+            return nil
+        end
+    end
+end
-- 
cgit 


From 90a9d09cd08ec072530e2f000e9f7b65f1c41095 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Tue, 14 Aug 2007 18:25:08 -0500
Subject: 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.

---
 lib/puppet/node_source/external.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/puppet/node_source/external.rb')

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]
-- 
cgit