Revert "Fixed #1201 - all external node attributes are converted to strings."
This reverts commit ac7f59618a
.
The reason for this revert is that the problem never really existed;
Ruby's true and false are always used unless you quote them.
This commit is contained in:
Родитель
8f8ce60819
Коммит
a0fa09f6ee
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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}
|
||||
|
|
Загрузка…
Ссылка в новой задаче