facter 1.6.1 → 1.6.2

data/lib/facter/util/virtual.rb

@@ -1,76 +1,86 @@
 module Facter::Util::Virtual
-    def self.openvz?
-        FileTest.directory?("/proc/vz") and FileTest.exists?( '/proc/vz/veinfo' )
-    end
+  def self.openvz?
+    FileTest.directory?("/proc/vz") and not self.openvz_cloudlinux?
+  end
 
-    def self.openvz_type
-        return nil unless self.openvz?
-        if FileTest.exists?("/proc/vz/version")
-            result = "openvzhn"
-        else
-            result = "openvzve"
-        end
-    end
+  # So one can either have #6728 work on OpenVZ or Cloudlinux. Whoo.
+  def self.openvz_type
+    return false unless self.openvz?
+    return false unless FileTest.exists?( '/proc/self/status' )
 
-    def self.zone?
-        return true if FileTest.directory?("/.SUNWnative")
-        z = Facter::Util::Resolution.exec("/sbin/zonename")
-        return false unless z
-        return z.chomp != 'global'
+    envid = Facter::Util::Resolution.exec( 'grep "envID" /proc/self/status' )
+    if envid =~ /^envID:\s+0$/i
+    return 'openvzhn'
+    elsif envid =~ /^envID:\s+(\d+)$/i
+    return 'openvzve'
     end
+  end
 
-    def self.vserver?
-        return false unless FileTest.exists?("/proc/self/status")
-        txt = File.read("/proc/self/status")
-        return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/
-        return false
-    end
+  # Cloudlinux uses OpenVZ to a degree, but always has an empty /proc/vz/ and
+  # has /proc/lve/list present
+  def self.openvz_cloudlinux?
+    FileTest.file?("/proc/lve/list") or Dir.glob('/proc/vz/*').empty?
+  end
 
-    def self.vserver_type
-        if self.vserver?
-            if FileTest.exists?("/proc/virtual")
-                "vserver_host"
-            else
-                "vserver"
-            end
-        end
-    end
+  def self.zone?
+    return true if FileTest.directory?("/.SUNWnative")
+    z = Facter::Util::Resolution.exec("/sbin/zonename")
+    return false unless z
+    return z.chomp != 'global'
+  end
 
-    def self.xen?
-        ["/proc/sys/xen", "/sys/bus/xen", "/proc/xen" ].detect do |f|
-            FileTest.exists?(f)
-        end
-    end
+  def self.vserver?
+    return false unless FileTest.exists?("/proc/self/status")
+    txt = File.read("/proc/self/status")
+    return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/
+    return false
+  end
 
-    def self.kvm?
-       txt = if FileTest.exists?("/proc/cpuinfo")
-           File.read("/proc/cpuinfo")
-       elsif Facter.value(:kernel)=="FreeBSD"
-           Facter::Util::Resolution.exec("/sbin/sysctl -n hw.model")
-       end
-       (txt =~ /QEMU Virtual CPU/) ? true : false
+  def self.vserver_type
+    if self.vserver?
+      if FileTest.exists?("/proc/virtual")
+        "vserver_host"
+      else
+        "vserver"
+      end
     end
+  end
 
-    def self.kvm_type
-      # TODO Tell the difference between kvm and qemu
-      # Can't work out a way to do this at the moment that doesn't
-      # require a special binary
-      "kvm"
+  def self.xen?
+    ["/proc/sys/xen", "/sys/bus/xen", "/proc/xen" ].detect do |f|
+      FileTest.exists?(f)
     end
+  end
 
-    def self.jail?
-        path = case Facter.value(:kernel)
-            when "FreeBSD" then "/sbin"
-            when "GNU/kFreeBSD" then "/bin"
-        end
-        Facter::Util::Resolution.exec("#{path}/sysctl -n security.jail.jailed") == "1"
-    end
+  def self.kvm?
+     txt = if FileTest.exists?("/proc/cpuinfo")
+       File.read("/proc/cpuinfo")
+     elsif Facter.value(:kernel)=="FreeBSD"
+       Facter::Util::Resolution.exec("/sbin/sysctl -n hw.model")
+     end
+     (txt =~ /QEMU Virtual CPU/) ? true : false
+  end
 
-    def self.hpvm?
-        Facter::Util::Resolution.exec("/usr/bin/getconf MACHINE_MODEL").chomp =~ /Virtual Machine/
+  def self.kvm_type
+    # TODO Tell the difference between kvm and qemu
+    # Can't work out a way to do this at the moment that doesn't
+    # require a special binary
+    "kvm"
+  end
+
+  def self.jail?
+    path = case Facter.value(:kernel)
+      when "FreeBSD" then "/sbin"
+      when "GNU/kFreeBSD" then "/bin"
     end
+    Facter::Util::Resolution.exec("#{path}/sysctl -n security.jail.jailed") == "1"
+  end
+
+  def self.hpvm?
+    Facter::Util::Resolution.exec("/usr/bin/getconf MACHINE_MODEL").chomp =~ /Virtual Machine/
+  end
 
    def self.zlinux?
-        "zlinux"
+    "zlinux"
    end
 end

data/lib/facter/util/vlans.rb

@@ -1,24 +1,24 @@
 # A module to gather vlan facts
 #
 module Facter::Util::Vlans
-    def self.get_vlan_config
-        output = ""
-            if File.exists?('/proc/net/vlan/config') and File.readable?('/proc/net/vlan/config')
-                output = File.open('/proc/net/vlan/config').read
-            end
-        output
-    end
+  def self.get_vlan_config
+    output = ""
+      if File.exists?('/proc/net/vlan/config') and File.readable?('/proc/net/vlan/config')
+        output = File.open('/proc/net/vlan/config').read
+      end
+    output
+  end
 
-    def self.get_vlans
-        vlans = Array.new
-        if self.get_vlan_config
-            self.get_vlan_config.each_line do |line|
-                if line =~ /^([0-9A-Za-z]+)\.([0-9]+) /
-                    vlans.insert(-1, $~[2]) if $~[2]
-                end
-            end
+  def self.get_vlans
+    vlans = Array.new
+    if self.get_vlan_config
+      self.get_vlan_config.each_line do |line|
+        if line =~ /^([0-9A-Za-z]+)\.([0-9]+) /
+          vlans.insert(-1, $~[2]) if $~[2]
         end
-
-        vlans.join(',')
+      end
     end
+
+    vlans.join(',')
+  end
 end

data/lib/facter/virtual.rb

@@ -10,142 +10,137 @@
 #   display.
 #
 #   On Linux, BSD, Solaris and HPUX:
-#     Much of the logic here is obscured behind util/virtual.rb, which rather
-#     than document here, which would encourage drift, just refer to it.
+#   Much of the logic here is obscured behind util/virtual.rb, which rather
+#   than document here, which would encourage drift, just refer to it.
 #   The Xen tests in here rely on /sys and /proc, and check for the presence and
 #   contents of files in there.
 #   If after all the other tests, it's still seen as physical, then it tries to
 #   parse the output of the "lspci", "dmidecode" and "prtdiag" and parses them
-#   for obvious signs of being under VMWare or Parallels.
+#   for obvious signs of being under VMWare, Parallels or VirtualBox.
 #   Finally it checks for the existence of vmware-vmx, which would hint it's
 #   VMWare.
 #
 # Caveats:
-#   Virtualbox detection isn't implemented. 
 #   Many checks rely purely on existence of files.
 #
 
 require 'facter/util/virtual'
 
 Facter.add("virtual") do
-    confine :kernel => "Darwin"
-
-    setcode do
-        require 'facter/util/macosx'
-        result = "physical"
-        output = Facter::Util::Macosx.profiler_data("SPDisplaysDataType")
-        if output.is_a?(Hash)
-            result = "parallels" if output["spdisplays_vendor-id"] =~ /0x1ab8/
-            result = "parallels" if output["spdisplays_vendor"] =~ /[Pp]arallels/
-            result = "vmware" if output["spdisplays_vendor-id"] =~ /0x15ad/
-            result = "vmware" if output["spdisplays_vendor"] =~ /VM[wW]are/
-        end
-        result
+  confine :kernel => "Darwin"
+
+  setcode do
+    require 'facter/util/macosx'
+    result = "physical"
+    output = Facter::Util::Macosx.profiler_data("SPDisplaysDataType")
+    if output.is_a?(Hash)
+      result = "parallels" if output["spdisplays_vendor-id"] =~ /0x1ab8/
+      result = "parallels" if output["spdisplays_vendor"] =~ /[Pp]arallels/
+      result = "vmware" if output["spdisplays_vendor-id"] =~ /0x15ad/
+      result = "vmware" if output["spdisplays_vendor"] =~ /VM[wW]are/
+      result = "virtualbox" if output["spdisplays_vendor-id"] =~ /0x80ee/
     end
+    result
+  end
 end
 
 
 Facter.add("virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX GNU/kFreeBSD}
+  confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX GNU/kFreeBSD}
 
-    result = "physical"
+  result = "physical"
 
-    setcode do
+  setcode do
 
-        if Facter.value(:operatingsystem) == "Solaris" and Facter::Util::Virtual.zone?
-            result = "zone"
-        end
+    if Facter.value(:operatingsystem) == "Solaris" and Facter::Util::Virtual.zone?
+      result = "zone"
+    end
 
-        if Facter.value(:kernel)=="HP-UX"
-            result = "hpvm" if Facter::Util::Virtual.hpvm?
-        end
+    if Facter.value(:kernel)=="HP-UX"
+      result = "hpvm" if Facter::Util::Virtual.hpvm?
+    end
 
-        if Facter.value(:architecture)=="s390x"
-            result = "zlinux" if Facter::Util::Virtual.zlinux?
-        end
+    if Facter.value(:architecture)=="s390x"
+      result = "zlinux" if Facter::Util::Virtual.zlinux?
+    end
 
-        if Facter::Util::Virtual.openvz?
-            result = Facter::Util::Virtual.openvz_type()
-        end
+    if Facter::Util::Virtual.openvz?
+      result = Facter::Util::Virtual.openvz_type()
+    end
 
-        if Facter::Util::Virtual.vserver?
-            result = Facter::Util::Virtual.vserver_type()
-        end
+    if Facter::Util::Virtual.vserver?
+      result = Facter::Util::Virtual.vserver_type()
+    end
 
-        if Facter::Util::Virtual.xen?
-            # new Xen domains have this in dom0 not domu :(
-            if FileTest.exists?("/proc/sys/xen/independent_wallclock")
-                result = "xenu"
-            end
-            if FileTest.exists?("/sys/bus/xen")
-                result = "xenu"
-            end
+    if Facter::Util::Virtual.xen?
+      if FileTest.exists?("/proc/xen/xsd_kva")
+        result = "xen0"
+      elsif FileTest.exists?("/proc/xen/capabilities")
+        result = "xenu"
+      end
+    end
 
-            if FileTest.exists?("/proc/xen/capabilities")
-                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
-                if txt =~ /control_d/i
-                    result = "xen0"
-                end
-            end
-        end
+    if Facter::Util::Virtual.kvm?
+      result = Facter::Util::Virtual.kvm_type()
+    end
 
-        if Facter::Util::Virtual.kvm?
-            result = Facter::Util::Virtual.kvm_type()
-        end
+    if ["FreeBSD", "GNU/kFreeBSD"].include? Facter.value(:kernel)
+      result = "jail" if Facter::Util::Virtual.jail?
+    end
 
-        if ["FreeBSD", "GNU/kFreeBSD"].include? Facter.value(:kernel)
-            result = "jail" if Facter::Util::Virtual.jail?
+    if result == "physical"
+      output = Facter::Util::Resolution.exec('lspci')
+      if not output.nil?
+        output.each_line do |p|
+          # --- look for the vmware video card to determine if it is virtual => vmware.
+          # ---   00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter
+          result = "vmware" if p =~ /VM[wW]are/
+          # --- look for virtualbox video card to determine if it is virtual => virtualbox.
+          # ---   00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter
+          result = "virtualbox" if p =~ /VirtualBox/
+          # --- look for pci vendor id used by Parallels video card
+          # ---   01:00.0 VGA compatible controller: Unknown device 1ab8:4005
+          result = "parallels" if p =~ /1ab8:|[Pp]arallels/
+          # --- look for pci vendor id used by Xen HVM device
+          # ---   00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)
+          result = "xenhvm" if p =~ /XenSource/
+          # --- look for Hyper-V video card
+          # ---   00:08.0 VGA compatible controller: Microsoft Corporation Hyper-V virtual VGA
+          result = "hyperv" if p =~ /Microsoft Corporation Hyper-V/
         end
-
-        if result == "physical"
-            output = Facter::Util::Resolution.exec('lspci')
-            if not output.nil?
-                output.each_line do |p|
-                    # --- look for the vmware video card to determine if it is virtual => vmware.
-                    # ---     00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter
-                    result = "vmware" if p =~ /VM[wW]are/
-                    # --- look for virtualbox video card to determine if it is virtual => virtualbox.
-                    # ---     00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter
-                    result = "virtualbox" if p =~ /VirtualBox/
-                    # --- look for pci vendor id used by Parallels video card
-                    # ---   01:00.0 VGA compatible controller: Unknown device 1ab8:4005
-                    result = "parallels" if p =~ /1ab8:|[Pp]arallels/
-                    # --- look for pci vendor id used by Xen HVM device
-                    # ---   00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)
-                    result = "xenhvm" if p =~ /XenSource/
-                end
-            else
-                output = Facter::Util::Resolution.exec('dmidecode')
-                if not output.nil?
-                    output.each_line do |pd|
-                        result = "parallels" if pd =~ /Parallels/
-                        result = "vmware" if pd =~ /VMware/
-                        result = "virtualbox" if pd =~ /VirtualBox/
-                        result = "xenhvm" if pd =~ /HVM domU/
-                    end
-                elsif Facter.value(:kernel) == 'SunOS'
-                    res = Facter::Util::Resolution.new('prtdiag')
-                    res.timeout = 6
-                    res.setcode('prtdiag')
-                    output = res.value
-                    if not output.nil?
-                        output.each_line do |pd|
-                            result = "parallels" if pd =~ /Parallels/
-                            result = "vmware" if pd =~ /VMware/
-							result = "virtualbox" if pd =~ /VirtualBox/
-                            result = "xenhvm" if pd =~ /HVM domU/
-                        end
-                    end
-                end
-            end
-            
-            if output = Facter::Util::Resolution.exec("vmware -v")
-                result = output.sub(/(\S+)\s+(\S+).*/) { | text | "#{$1}_#{$2}"}.downcase
+      else
+        output = Facter::Util::Resolution.exec('dmidecode')
+        if not output.nil?
+          output.each_line do |pd|
+            result = "parallels" if pd =~ /Parallels/
+            result = "vmware" if pd =~ /VMware/
+            result = "virtualbox" if pd =~ /VirtualBox/
+            result = "xenhvm" if pd =~ /HVM domU/
+            result = "hyperv" if pd =~ /Product Name: Virtual Machine/
+          end
+        elsif Facter.value(:kernel) == 'SunOS'
+          res = Facter::Util::Resolution.new('prtdiag')
+          res.timeout = 6
+          res.setcode('prtdiag')
+          output = res.value
+          if not output.nil?
+            output.each_line do |pd|
+              result = "parallels" if pd =~ /Parallels/
+              result = "vmware" if pd =~ /VMware/
+              result = "virtualbox" if pd =~ /VirtualBox/
+              result = "xenhvm" if pd =~ /HVM domU/
             end
+          end
         end
-
-        result
+      end
+      
+      if output = Facter::Util::Resolution.exec("vmware -v")
+        result = output.sub(/(\S+)\s+(\S+).*/) { | text | "#{$1}_#{$2}"}.downcase
+      end
     end
+
+    result
+  end
 end
 
 # Fact: is_virtual
@@ -160,15 +155,15 @@ end
 #
 
 Facter.add("is_virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX Darwin GNU/kFreeBSD}
+  confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX Darwin GNU/kFreeBSD}
 
-    setcode do
-        physical_types = %w{physical xen0 vmware_server vmware_workstation openvzhn}
+  setcode do
+    physical_types = %w{physical xen0 vmware_server vmware_workstation openvzhn}
 
-        if physical_types.include? Facter.value(:virtual)
-            "false"
-        else
-            "true"
-        end
+    if physical_types.include? Facter.value(:virtual)
+      "false"
+    else
+      "true"
     end
+  end
 end

data/lib/facter/vlans.rb

@@ -10,9 +10,9 @@
 
 require 'facter/util/vlans'
     
-    Facter.add("vlans") do
-        confine :kernel => :linux
-        setcode do
-            Facter::Util::Vlans.get_vlans
-        end
-    end
+Facter.add("vlans") do
+  confine :kernel => :linux
+  setcode do
+    Facter::Util::Vlans.get_vlans
+  end
+end