From a0fa09f6ee562dd1b61fe56dd4b914419d641986 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Fri, 18 Jul 2008 00:12:01 -0500 Subject: Revert "Fixed #1201 - all external node attributes are converted to strings." This reverts commit ac7f59618a80b6a4aac777f6184e7fa6a0614079. The reason for this revert is that the problem never really existed; Ruby's true and false are always used unless you quote them. --- CHANGELOG | 2 -- lib/puppet/indirector/node/exec.rb | 7 ------- spec/unit/indirector/node/exec.rb | 6 ------ 3 files changed, 15 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index baa693d67..13edbede9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -77,8 +77,6 @@ but external nodes just use the certificate name and any custom terminus types will use just the certificate name. - Fixed #1201 - all external node attributes are converted to strings. - Fixing #1168 (for 0.24.x) -- automatically downcasing the fqdn. Also requiring that passed in certnames be downcased; the setting system isn't currently flexible enough to automatically downcase diff --git a/lib/puppet/indirector/node/exec.rb b/lib/puppet/indirector/node/exec.rb index 029a35c4f..52cbc370c 100644 --- a/lib/puppet/indirector/node/exec.rb +++ b/lib/puppet/indirector/node/exec.rb @@ -30,13 +30,6 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec def create_node(name, result) node = Puppet::Node.new(name) set = false - if current = result[:parameters] - result[:parameters] = current.inject({}) do |strings, ary| - param, value = ary - strings[param] = value.to_s - strings - end - end [:parameters, :classes, :environment].each do |param| if value = result[param] node.send(param.to_s + "=", value) diff --git a/spec/unit/indirector/node/exec.rb b/spec/unit/indirector/node/exec.rb index 2276e4298..09f13ab90 100755 --- a/spec/unit/indirector/node/exec.rb +++ b/spec/unit/indirector/node/exec.rb @@ -49,12 +49,6 @@ describe Puppet::Node::Exec do @searcher.find(@request) end - it "should convert all parameters into strings" do - @result[:parameters] = {"a" => true, "c" => 100} - @node.expects(:parameters=).with "a" => "true", "c" => "100" - @searcher.find(@request) - end - it "should set the resulting classes as the node classes" do @result[:classes] = %w{one two} @node.expects(:classes=).with %w{one two} -- cgit