facter 1.6.1 → 1.6.2

data/lib/facter/netmask.rb

@@ -18,9 +18,9 @@
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
-    confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd" ]
-    setcode do
-        Facter::NetMask.get_netmask
-    end
+  confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly ]
+  setcode do
+    Facter::NetMask.get_netmask
+  end
 end
 

data/lib/facter/network.rb

@@ -13,9 +13,9 @@
 require 'facter/util/ip'
 
 Facter::Util::IP.get_interfaces.each do |interface|
-    Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
-        setcode do
-            Facter::Util::IP.get_network_value(interface)
-        end 
+  Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
+    setcode do
+      Facter::Util::IP.get_network_value(interface)
     end 
+  end 
 end

data/lib/facter/operatingsystem.rb

@@ -14,83 +14,87 @@
 require 'facter/lsb'
 
 Facter.add(:operatingsystem) do
-    confine :kernel => :sunos
-    setcode do "Solaris" end
+  confine :kernel => :sunos
+  setcode do "Solaris" end
 end
 
 Facter.add(:operatingsystem) do
-    confine :kernel => :linux
-    setcode do
-        if Facter.value(:lsbdistid) == "Ubuntu"
-           "Ubuntu"
-        elsif FileTest.exists?("/etc/debian_version")
-            "Debian"
-        elsif FileTest.exists?("/etc/gentoo-release")
-            "Gentoo"
-        elsif FileTest.exists?("/etc/fedora-release")
-            "Fedora"
-        elsif FileTest.exists?("/etc/mandriva-release")
-            "Mandriva"
-        elsif FileTest.exists?("/etc/mandrake-release")
-            "Mandrake"
-        elsif FileTest.exists?("/etc/meego-release")
-            "MeeGo"
-        elsif FileTest.exists?("/etc/arch-release")
-            "Archlinux"
-        elsif FileTest.exists?("/etc/oracle-release")
-            "OracleLinux"
-        elsif FileTest.exists?("/etc/enterprise-release")
-            if FileTest.exists?("/etc/ovs-release")
-                "OVS"
-            else
-                "OEL"
-            end
-        elsif FileTest.exists?("/etc/arch-release")
-            "Arch"
-        elsif FileTest.exists?("/etc/vmware-release")
-            "VMWareESX"
-        elsif FileTest.exists?("/etc/redhat-release")
-            txt = File.read("/etc/redhat-release")
-            if txt =~ /centos/i
-                "CentOS"
-            elsif txt =~ /CERN/
-                "SLC"
-            elsif txt =~ /scientific/i 
-                "Scientific"
-            else
-                "RedHat"
-            end
-        elsif FileTest.exists?("/etc/SuSE-release")
-            txt = File.read("/etc/SuSE-release")
-            if txt =~ /^SUSE LINUX Enterprise Server/i
-                "SLES"
-            elsif txt =~ /^SUSE LINUX Enterprise Desktop/i
-                "SLED"
-            elsif txt =~ /^openSUSE/i
-                "OpenSuSE"
-            else
-                "SuSE"
-            end
-        elsif FileTest.exists?("/etc/bluewhite64-version")
-            "Bluewhite64"
-        elsif FileTest.exists?("/etc/slamd64-version")
-            "Slamd64"
-        elsif FileTest.exists?("/etc/slackware-version")
-            "Slackware"
-        elsif FileTest.exists?("/etc/alpine-release")
-            "Alpine"
-        end
+  confine :kernel => :linux
+  setcode do
+    if Facter.value(:lsbdistid) == "Ubuntu"
+       "Ubuntu"
+    elsif FileTest.exists?("/etc/debian_version")
+      "Debian"
+    elsif FileTest.exists?("/etc/gentoo-release")
+      "Gentoo"
+    elsif FileTest.exists?("/etc/fedora-release")
+      "Fedora"
+    elsif FileTest.exists?("/etc/mandriva-release")
+      "Mandriva"
+    elsif FileTest.exists?("/etc/mandrake-release")
+      "Mandrake"
+    elsif FileTest.exists?("/etc/meego-release")
+      "MeeGo"
+    elsif FileTest.exists?("/etc/arch-release")
+      "Archlinux"
+    elsif FileTest.exists?("/etc/oracle-release")
+      "OracleLinux"
+    elsif FileTest.exists?("/etc/enterprise-release")
+      if FileTest.exists?("/etc/ovs-release")
+        "OVS"
+      else
+        "OEL"
+      end
+    elsif FileTest.exists?("/etc/arch-release")
+      "Arch"
+    elsif FileTest.exists?("/etc/vmware-release")
+      "VMWareESX"
+    elsif FileTest.exists?("/etc/redhat-release")
+      txt = File.read("/etc/redhat-release")
+      if txt =~ /centos/i
+        "CentOS"
+      elsif txt =~ /CERN/
+        "SLC"
+      elsif txt =~ /scientific/i 
+        "Scientific"
+      elsif txt =~ /^cloudlinux/i
+        "CloudLinux"
+      else
+        "RedHat"
+      end
+    elsif FileTest.exists?("/etc/SuSE-release")
+      txt = File.read("/etc/SuSE-release")
+      if txt =~ /^SUSE LINUX Enterprise Server/i
+        "SLES"
+      elsif txt =~ /^SUSE LINUX Enterprise Desktop/i
+        "SLED"
+      elsif txt =~ /^openSUSE/i
+        "OpenSuSE"
+      else
+        "SuSE"
+      end
+    elsif FileTest.exists?("/etc/bluewhite64-version")
+      "Bluewhite64"
+    elsif FileTest.exists?("/etc/slamd64-version")
+      "Slamd64"
+    elsif FileTest.exists?("/etc/slackware-version")
+      "Slackware"
+    elsif FileTest.exists?("/etc/alpine-release")
+      "Alpine"
+    elsif Facter.value(:lsbdistdescription) =~ /Amazon Linux/
+      "Amazon"
     end
+  end
 end
 
 Facter.add(:operatingsystem) do
-    confine :kernel => "VMkernel"
-    setcode do
-        "ESXi"
-    end
+  confine :kernel => "VMkernel"
+  setcode do
+    "ESXi"
+  end
 end
 
 Facter.add(:operatingsystem) do
-    # Default to just returning the kernel as the operating system
-    setcode do Facter[:kernel].value end
+  # Default to just returning the kernel as the operating system
+  setcode do Facter[:kernel].value end
 end

data/lib/facter/operatingsystemrelease.rb

@@ -9,6 +9,7 @@
 #   On Suse, derivatives, parses '/etc/SuSE-release' for a selection of version
 #   information.
 #   On Slackware, parses '/etc/slackware-version'.
+#   On Amazon Linux, returns the 'lsbdistrelease' value.
 #   
 #   On all remaining systems, returns the 'kernelrelease' value.
 #
@@ -16,112 +17,112 @@
 #
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC}
-    setcode do
-        case Facter.value(:operatingsystem)
-        when "CentOS", "RedHat", "Scientific", "SLC"
-            releasefile = "/etc/redhat-release"
-        when "Fedora"
-            releasefile = "/etc/fedora-release"
-        when "MeeGo"
-            releasefile = "/etc/meego-release"
-        when "OracleLinux"
-            releasefile = "/etc/oracle-release"
-        when "OEL", "oel"
-            releasefile = "/etc/enterprise-release"
-        when "OVS", "ovs"
-            releasefile = "/etc/ovs-release"
-        end
-        File::open(releasefile, "r") do |f|
-            line = f.readline.chomp
-            if line =~ /\(Rawhide\)$/
-                "Rawhide"
-            elsif line =~ /release (\d[\d.]*)/
-                $1
-            end
-        end
+  confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC CloudLinux}
+  setcode do
+    case Facter.value(:operatingsystem)
+    when "CentOS", "RedHat", "Scientific", "SLC", "CloudLinux"
+      releasefile = "/etc/redhat-release"
+    when "Fedora"
+      releasefile = "/etc/fedora-release"
+    when "MeeGo"
+      releasefile = "/etc/meego-release"
+    when "OracleLinux"
+      releasefile = "/etc/oracle-release"
+    when "OEL", "oel"
+      releasefile = "/etc/enterprise-release"
+    when "OVS", "ovs"
+      releasefile = "/etc/ovs-release"
+    end
+    File::open(releasefile, "r") do |f|
+      line = f.readline.chomp
+      if line =~ /\(Rawhide\)$/
+        "Rawhide"
+      elsif line =~ /release (\d[\d.]*)/
+        $1
+      end
     end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Debian}
-    setcode do
-        release = Facter::Util::Resolution.exec('cat /etc/debian_version')
-    end
+  confine :operatingsystem => %w{Debian}
+  setcode do
+    release = Facter::Util::Resolution.exec('cat /etc/debian_version')
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Ubuntu}
-    setcode do
-        release = Facter::Util::Resolution.exec('cat /etc/issue')
-        if release =~ /Ubuntu (\d+.\d+)/
-            $1
-        end
+  confine :operatingsystem => %w{Ubuntu}
+  setcode do
+    release = Facter::Util::Resolution.exec('cat /etc/issue')
+    if release =~ /Ubuntu (\d+.\d+)/
+      $1
     end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{SLES SLED OpenSuSE}
-    setcode do
-        releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
-        if releasefile =~ /^VERSION\s*=\s*(\d+)/
-            releasemajor = $1
-            if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/
-                releaseminor = $1
-            elsif releasefile =~ /^VERSION\s=.*.(\d+)/
-                releaseminor = $1
-            else
-                releaseminor = "0"
-            end
-            releasemajor + "." + releaseminor
-        else
-            "unknown"
-        end
+  confine :operatingsystem => %w{SLES SLED OpenSuSE}
+  setcode do
+    releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
+    if releasefile =~ /^VERSION\s*=\s*(\d+)/
+      releasemajor = $1
+      if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/
+        releaseminor = $1
+      elsif releasefile =~ /^VERSION\s=.*.(\d+)/
+        releaseminor = $1
+      else
+        releaseminor = "0"
+      end
+      releasemajor + "." + releaseminor
+    else
+      "unknown"
     end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Slackware}
-    setcode do
-        release = Facter::Util::Resolution.exec('cat /etc/slackware-version')
-        if release =~ /Slackware ([0-9.]+)/
-            $1
-        end
+  confine :operatingsystem => %w{Slackware}
+  setcode do
+    release = Facter::Util::Resolution.exec('cat /etc/slackware-version')
+    if release =~ /Slackware ([0-9.]+)/
+      $1
     end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Bluewhite64}
-    setcode do
-        releasefile = Facter::Util::Resolution.exec('cat /etc/bluewhite64-version')
-        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
-            $1 + "." + $2
-        else
-            "unknown"
-        end
+  confine :operatingsystem => %w{Bluewhite64}
+  setcode do
+    releasefile = Facter::Util::Resolution.exec('cat /etc/bluewhite64-version')
+    if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+      $1 + "." + $2
+    else
+      "unknown"
     end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{VMwareESX}
-    setcode do
-        release = Facter::Util::Resolution.exec('vmware -v')
-        if release =~ /VMware ESX .*?(\d.*)/
-            $1
-        end
+  confine :operatingsystem => %w{VMwareESX}
+  setcode do
+    release = Facter::Util::Resolution.exec('vmware -v')
+    if release =~ /VMware ESX .*?(\d.*)/
+      $1
     end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Slamd64}
-    setcode do
-        releasefile = Facter::Util::Resolution.exec('cat /etc/slamd64-version')
-        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
-            $1 + "." + $2
-        else
-            "unknown"
-        end
+  confine :operatingsystem => %w{Slamd64}
+  setcode do
+    releasefile = Facter::Util::Resolution.exec('cat /etc/slamd64-version')
+    if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+      $1 + "." + $2
+    else
+      "unknown"
     end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
@@ -132,5 +133,10 @@ Facter.add(:operatingsystemrelease) do
 end
 
 Facter.add(:operatingsystemrelease) do
-    setcode do Facter[:kernelrelease].value end
+  confine :operatingsystem => %W{Amazon}
+  setcode do Facter[:lsbdistrelease].value end
+end
+
+Facter.add(:operatingsystemrelease) do
+  setcode do Facter[:kernelrelease].value end
 end

data/lib/facter/osfamily.rb

@@ -0,0 +1,31 @@
+# Fact: osfamily
+#
+# Purpose: Returns the operating system
+#
+# Resolution:
+#   Maps operating systems to operating system families, such as linux
+#   distribution derivatives. Adds mappings from specific operating systems
+#   to kernels in the case that it is relevant.
+#
+# Caveats:
+#   This fact is completely reliant on the operatingsystem fact, and no
+#   heuristics are used
+#
+
+Facter.add(:osfamily) do
+
+  setcode do
+    case Facter.value(:operatingsystem)
+    when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "CloudLinux", "OracleLinux", "OVS", "OEL"
+      "RedHat"
+    when "Ubuntu", "Debian"
+      "Debian"
+    when "SLES", "SLED", "OpenSuSE", "SuSE"
+      "Suse"
+    when "Solaris"
+      "Solaris"
+    else
+      Facter.value("kernel")
+    end
+  end
+end

data/lib/facter/path.rb

@@ -8,7 +8,7 @@
 #
 
 Facter.add(:path) do
-    setcode do
-        ENV['PATH']
-    end
+  setcode do
+    ENV['PATH']
+  end
 end

data/lib/facter/physicalprocessorcount.rb

@@ -62,3 +62,11 @@ Facter.add('physicalprocessorcount') do
     Facter::Util::WMI.execquery("select Name from Win32_Processor").Count
   end
 end
+
+Facter.add('physicalprocessorcount') do
+  confine :kernel => :sunos
+
+  setcode do
+    Facter::Util::Resolution.exec("/usr/sbin/psrinfo -p")
+  end
+end