Set the timeout for the host-based and resolv-based resolutions to 2.

Signed-off-by: Luke Kanies <luke@madstop.com>

4 files changed, 6 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1e50cfd..af190c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 1.5.x:
+    Set the timeout the host-based and resolve-based resolutions to 2.
+
     Fixed #1495 - CentOS version detection is now better.
 
     Fixed #1422 - Facter now defaults to 0 timeout.
diff --git a/lib/facter/ipaddress.rb b/lib/facter/ipaddress.rb
index c97abe4..b18b7c9 100644
--- a/lib/facter/ipaddress.rb
+++ b/lib/facter/ipaddress.rb
@@ -1,4 +1,4 @@
-Facter.add(:ipaddress, :ldapname => "iphostnumber") do
+Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
     setcode do
         require 'resolv'
 
@@ -19,7 +19,7 @@ Facter.add(:ipaddress, :ldapname => "iphostnumber") do
     end
 end
 
-Facter.add(:ipaddress) do
+Facter.add(:ipaddress, :timeout => 2) do
     setcode do
         if hostname = Facter.value(:hostname)
             # we need Hostname to exist for this to work
diff --git a/lib/facter/kernelrelease.rb b/lib/facter/kernelrelease.rb
index bff7a90..5dccf8f 100644
--- a/lib/facter/kernelrelease.rb
+++ b/lib/facter/kernelrelease.rb
@@ -2,7 +2,7 @@ Facter.add(:kernelrelease) do
     setcode 'uname -r'
 end
 
-Facter.add(:kernelrelease, :timeout => 5) do
+Facter.add(:kernelrelease) do
     confine :kernel => :aix
     setcode 'oslevel -s'
 end
diff --git a/lib/facter/puppetversion.rb b/lib/facter/puppetversion.rb
index 16510c8..66fcfe8 100644
--- a/lib/facter/puppetversion.rb
+++ b/lib/facter/puppetversion.rb
@@ -1,4 +1,4 @@
-Facter.add(:puppetversion, :timeout => 1.5) do
+Facter.add(:puppetversion) do
     setcode {
         begin
             require 'puppet'