For some reason, the :timeout option in ipaddress.rb option started
causing facter to crash, since there is no timeout= method in the
collection, fact, or resolution classes. Removed the option, and
replaced it with a call to the limit method inside the resolution block.
Signed-off-by: Adrien Thebo <adr...@puppetlabs.com>
---
Local-branch: ticket/master/7753
lib/facter/ipaddress.rb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/facter/ipaddress.rb b/lib/facter/ipaddress.rb
index 5260504..6e83c90 100644
--- a/lib/facter/ipaddress.rb
+++ b/lib/facter/ipaddress.rb
@@ -110,7 +110,8 @@ Facter.add(:ipaddress) do
end
end
-Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
+Facter.add(:ipaddress, :ldapname => "iphostnumber") do
+ limit 2
setcode do
if Facter.value(:kernel) == 'windows'
require 'win32/resolv'
@@ -139,7 +140,8 @@ Facter.add(:ipaddress, :ldapname => "iphostnumber",
:timeout => 2) do
end
end
-Facter.add(:ipaddress, :timeout => 2) do
+Facter.add(:ipaddress) do
+ limit 2
setcode do
if hostname = Facter.value(:hostname)
# we need Hostname to exist for this to work
--
1.7.3.4
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
