Fixing the rest of #1113: External node commands can specify

an environment and Puppet will now use it.

3 files changed, 10 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f7c12f3a9..c7e443ef8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+    Fixing the rest of #1113: External node commands can specify
+    an environment and Puppet will now use it.
+
     Partially fixing #1113: LDAP nodes now support environments,
     and the schema has been updated accordingly.
 
diff --git a/lib/puppet/indirector/node/exec.rb b/lib/puppet/indirector/node/exec.rb
index ed76bce94..71f4fa8e1 100644
--- a/lib/puppet/indirector/node/exec.rb
+++ b/lib/puppet/indirector/node/exec.rb
@@ -30,7 +30,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
     def create_node(name, result)
         node = Puppet::Node.new(name)
         set = false
-        [:parameters, :classes].each do |param|
+        [:parameters, :classes, :environment].each do |param|
             if value = result[param]
                 node.send(param.to_s + "=", value)
                 set = true
diff --git a/spec/unit/indirector/node/exec.rb b/spec/unit/indirector/node/exec.rb
index 744a32b0a..5e6a9b1da 100755
--- a/spec/unit/indirector/node/exec.rb
+++ b/spec/unit/indirector/node/exec.rb
@@ -59,4 +59,10 @@ describe Puppet::Node::Exec, " when handling the results of the command" do
         @node.expects(:fact_merge)
         @searcher.find(@name)
     end
+
+    it "should set the node's environment if one is provided" do
+        @result[:environment] = "yay"
+        @node.expects(:environment=).with "yay"
+        @searcher.find(@name)
+    end
 end