facter 2.4.1 → 2.4.3

data/lib/facter/ec2.rb

@@ -15,7 +15,7 @@
 #   Directly queries the EC2 metadata endpoint.
 #
 
-require 'facter/ec2/rest'
+require 'facter/ec2/rest' unless defined?(Facter::EC2)
 
 Facter.define_fact(:ec2_metadata) do
   define_resolution(:rest) do

data/lib/facter/ec2/rest.rb

@@ -96,6 +96,9 @@ module Facter
       rescue *CONNECTION_ERRORS => e
         Facter.log_exception(e, "Failed to fetch ec2 uri #{uri}: #{e.message}")
         return nil
+      rescue Timeout::Error => e
+        Facter.log_exception(e, "Failed to fetch ec2 uri #{uri}: #{e.message}")
+        return nil
       end
 
       private

data/lib/facter/operatingsystem/implementation.rb

@@ -1,4 +1,5 @@
 require 'facter/operatingsystem/base'
+require 'facter/operatingsystem/osreleaselinux'
 require 'facter/operatingsystem/cumuluslinux'
 require 'facter/operatingsystem/linux'
 require 'facter/operatingsystem/sunos'
@@ -13,6 +14,8 @@ module Facter
         release_info = Facter::Util::Operatingsystem.os_release
         if release_info['NAME'] == "Cumulus Linux"
           Facter::Operatingsystem::CumulusLinux.new
+        elsif release_info['NAME'] == "CoreOS"
+          Facter::Operatingsystem::OsReleaseLinux.new
         else
           Facter::Operatingsystem::Linux.new
         end

data/lib/facter/operatingsystem/osreleaselinux.rb

@@ -0,0 +1,28 @@
+require 'facter/util/operatingsystem'
+require 'facter/operatingsystem/linux'
+
+module Facter
+  module Operatingsystem
+    class OsReleaseLinux < Linux
+      def get_operatingsystem
+        # Native cfacter also uses the NAME field.
+        Facter::Util::Operatingsystem.os_release['NAME']
+      end
+
+      def get_osfamily
+        Facter::Util::Operatingsystem.os_release['NAME']
+      end
+
+      def get_operatingsystemrelease
+        @operatingsystemrelease ||= Facter::Util::Operatingsystem.os_release['VERSION_ID']
+        @operatingsystemrelease
+      end
+
+      def get_operatingsystemmajrelease
+        if operatingsystemrelease = get_operatingsystemrelease
+          operatingsystemrelease.split(".").first
+        end
+      end
+    end
+  end
+end

data/lib/facter/puppetversion.rb

@@ -11,8 +11,8 @@
 Facter.add(:puppetversion) do
   setcode do
     begin
-      require 'puppet'
-      Puppet::PUPPETVERSION.to_s
+      require 'puppet/version'
+      Puppet.version.to_s
     rescue LoadError
       nil
     end

data/lib/facter/selinux.rb

@@ -148,7 +148,7 @@ Facter.add("selinux_config_policy") do
   setcode do
     result = 'unknown'
     mode = Facter::Core::Execution.exec(sestatus_cmd)
-    mode.each_line { |l| result = $1 if l =~ /^Policy from config file\:\s+(\w+)$/i }
+    mode.each_line { |l| result = $2 if l =~ /^(Policy from config file|Loaded policy name)\:\s+(\w+)$/i }
     result.chomp
   end
 end

data/lib/facter/util/config.rb

@@ -41,16 +41,19 @@ module Facter::Util::Config
     if Facter::Util::Root.root?
       windows_dir = windows_data_dir
       if windows_dir.nil? then
-        # Note: Beginning with Facter 3, /opt/puppetlabs/agent/facts.d will be the only
+        # Note: Beginning with Facter 3, /opt/puppetlabs/facter/facts.d will be the only
         # default external fact directory.
-        @external_facts_dirs = ["/opt/puppetlabs/agent/facts.d",
+        @external_facts_dirs = ["/opt/puppetlabs/facter/facts.d",
                                 "/etc/facter/facts.d",
                                 "/etc/puppetlabs/facter/facts.d"]
       else
         @external_facts_dirs = [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
       end
     elsif ENV['HOME']
-      @external_facts_dirs = [File.expand_path(File.join(ENV['HOME'], ".facter", "facts.d"))]
+      # Note: Beginning with Facter 3, ~/.puppetlabs/opt/facter/facts.d will be the only
+      # default external fact directory.
+      @external_facts_dirs = [File.expand_path(File.join(ENV['HOME'], ".puppetlabs", "opt", "facter", "facts.d")),
+                              File.expand_path(File.join(ENV['HOME'], ".facter", "facts.d"))]
     else
       @external_facts_dirs = []
     end
@@ -64,4 +67,22 @@ module Facter::Util::Config
   end
 
   setup_default_ext_facts_dirs
+
+  def self.override_binary_dir=(dir)
+    @override_binary_dir = dir
+  end
+
+  def self.override_binary_dir
+    @override_binary_dir
+  end
+
+  def self.setup_default_override_binary_dir
+    if Facter::Util::Config.is_windows?
+      @override_binary_dir = nil
+    else
+      @override_binary_dir = "/opt/puppetlabs/puppet/bin"
+    end
+  end
+
+  setup_default_override_binary_dir
 end

data/lib/facter/util/directory_loader.rb

@@ -1,9 +1,9 @@
 # A Facter plugin that loads external facts.
 #
 # Default Unix Directories:
-# /opt/puppetlabs/agent/facts.d, /etc/facter/facts.d, /etc/puppetlabs/facter/facts.d
+# /opt/puppetlabs/facter/facts.d, /etc/facter/facts.d, /etc/puppetlabs/facter/facts.d
 #
-# Beginning with Facter 3, only /opt/puppetlabs/agent/facts.d will be a default external fact
+# Beginning with Facter 3, only /opt/puppetlabs/facter/facts.d will be a default external fact
 # directory in Unix.
 #
 # Default Windows Direcotires:

data/lib/facter/util/ip.rb

@@ -286,8 +286,8 @@ module Facter::Util::IP
     # Linux changes the MAC address reported via ifconfig when an ethernet interface
     # becomes a slave of a bonding device to the master MAC address.
     # We have to dig a bit to get the original/real MAC address of the interface.
-    bonddev = get_bonding_master(interface)
-    if label == 'macaddress' and bonddev
+    bonddev = get_bonding_master(interface) if label == 'macaddress'
+    if bonddev
       bondinfo = read_proc_net_bonding("/proc/net/bonding/#{bonddev}")
       re = /^Slave Interface: #{interface}\b.*?\bPermanent HW addr: (([0-9A-F]{2}:?)*)$/im
       if match = re.match(bondinfo)

data/lib/facter/util/virtual.rb

@@ -13,9 +13,17 @@ module Facter::Util::Virtual
   # and later versions of virt-what may emit this message on stderr. This
   # method ensures stderr is redirected and that error messages are stripped
   # from stdout.
-  def self.virt_what(command = "virt-what")
-    command = Facter::Core::Execution.which(command)
-    return unless command
+  def self.virt_what(cmd = "virt-what")
+    if bindir = Facter::Util::Config.override_binary_dir
+      command = Facter::Core::Execution.which(File.join(bindir, cmd))
+    else
+      command = nil
+    end
+
+    if !command
+      command = Facter::Core::Execution.which(cmd)
+      return unless command
+    end
 
     if Facter.value(:kernel) == 'windows'
       redirected_cmd = "#{command} 2>NUL"

data/lib/facter/util/xendomains.rb

@@ -4,7 +4,16 @@ module Facter::Util::Xendomains
   XEN_COMMANDS = ['/usr/sbin/xl', '/usr/sbin/xm']
 
   def self.xen_command
-    XEN_COMMANDS.find { |cmd| Facter::Util::Resolution.which(cmd) }
+    if File.file?('/usr/lib/xen-common/bin/xen-toolstack')
+      xen_toolstack_cmd = Facter::Util::Resolution.exec('/usr/lib/xen-common/bin/xen-toolstack')
+      if xen_toolstack_cmd
+        xen_toolstack_cmd.chomp
+      else
+        nil
+      end
+    else
+      XEN_COMMANDS.find { |cmd| Facter::Util::Resolution.which(cmd) }
+    end
   end
 
   def self.get_domains

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '2.4.1'
+    FACTERVERSION = '2.4.3'
   end
 
   # Returns the running version of Facter.

data/lib/facter/virtual.rb

@@ -73,7 +73,7 @@ end
 Facter.add("virtual") do
   confine :kernel => 'SunOS'
   has_weight 10
-  self.timeout = 6
+  self.timeout = 20
 
   setcode do
     next "zone" if Facter::Util::Virtual.zone?
@@ -164,6 +164,7 @@ Facter.add("virtual") do
       next "rhev"       if lines.any? {|l| l =~ /Product Name: RHEV Hypervisor/ }
       next "ovirt"      if lines.any? {|l| l =~ /Product Name: oVirt Node/ }
       next "bochs"      if lines.any? {|l| l =~ /Bochs/ }
+      next "kvm"        if lines.any? {|l| l =~ /Manufacturer: QEMU/ }
     end
 
     # Default to 'physical'

data/spec/fixtures/unit/selinux/selinux_sestatus2

@@ -0,0 +1,9 @@
+SELinux status: enabled
+SELinuxfs mount: /sys/fs/selinux
+SELinux root directory: /etc/selinux
+Loaded policy name: default
+Current mode: enforcing
+Mode from config file: permissive
+Policy MLS status: enabled
+Policy deny_unknown status: denied
+Max kernel policy version: 29

data/spec/fixtures/unit/util/operatingsystem/coreos.txt

@@ -0,0 +1,9 @@
+NAME=CoreOS
+ID=coreos
+VERSION=575.0.0
+VERSION_ID=575.0.0
+BUILD_ID=
+PRETTY_NAME="CoreOS 575.0.0"
+ANSI_COLOR="1;32"
+HOME_URL="https://coreos.com/"
+BUG_REPORT_URL="https://github.com/coreos/bugs/issues"

data/spec/unit/operatingsystem/implementation_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'facter/operatingsystem/implementation'
 require 'facter/operatingsystem/base'
 require 'facter/operatingsystem/cumuluslinux'
+require 'facter/operatingsystem/osreleaselinux'
 require 'facter/operatingsystem/linux'
 require 'facter/operatingsystem/sunos'
 require 'facter/operatingsystem/vmkernel'

data/spec/unit/operatingsystem/linux_spec.rb

@@ -298,7 +298,7 @@ describe Facter::Operatingsystem::Linux do
   end
 
   describe "Operatingsystemmajrelease key" do
-    ['Amazon' 'AristaEOS', 'CentOS','CloudLinux','Debian','Fedora','OEL','OracleLinux','OVS','RedHat','Scientific','SLC','CumulusLinux'].each do |operatingsystem|
+    ['Amazon' 'AristaEOS', 'CentOS','CloudLinux','Debian','Fedora','OEL','OracleLinux','OVS','RedHat','Scientific','SLC','CumulusLinux','CoreOS'].each do |operatingsystem|
       describe "on #{operatingsystem} operatingsystems" do
         it "should be derived from operatingsystemrelease" do
           subject.stubs(:get_operatingsystem).returns(operatingsystem)

data/spec/unit/selinux_spec.rb

@@ -96,6 +96,11 @@ describe "SELinux facts" do
 
       Facter.fact(:selinux_config_policy).value.should == "targeted"
     end
+    it "should return the loaded SELinux policy" do
+      sestatus_is(my_fixture_read("selinux_sestatus2"))
+
+      Facter.fact(:selinux_config_policy).value.should == "default"
+    end
   end
 
   def sestatus_is(status)

data/spec/unit/util/config_spec.rb

@@ -55,7 +55,7 @@ describe Facter::Util::Config do
       Facter::Util::Config.stubs(:is_windows?).returns(false)
       Facter::Util::Config.stubs(:windows_data_dir).returns(nil)
       Facter::Util::Config.setup_default_ext_facts_dirs
-      Facter::Util::Config.external_facts_dirs.should == ["/opt/puppetlabs/agent/facts.d", "/etc/facter/facts.d", "/etc/puppetlabs/facter/facts.d"]
+      Facter::Util::Config.external_facts_dirs.should == ["/opt/puppetlabs/facter/facts.d", "/etc/facter/facts.d", "/etc/puppetlabs/facter/facts.d"]
     end
 
     it "should return the default value for windows 2008" do
@@ -72,10 +72,11 @@ describe Facter::Util::Config do
       Facter::Util::Config.external_facts_dirs.should == [File.join("C:\\Documents", 'PuppetLabs', 'facter', 'facts.d')]
     end
 
-    it "returns the users home directory when not root" do
+    it "returns the old and new (AIO) paths under user's home directory when not root" do
       Facter::Util::Root.stubs(:root?).returns(false)
       Facter::Util::Config.setup_default_ext_facts_dirs
-      Facter::Util::Config.external_facts_dirs.should == [File.expand_path(File.join("~", ".facter", "facts.d"))]
+      Facter::Util::Config.external_facts_dirs.should == [File.expand_path(File.join("~", ".puppetlabs", "opt", "facter", "facts.d")),
+                                                          File.expand_path(File.join("~", ".facter", "facts.d"))]
     end
 
     it "includes additional values when user appends to the list" do
@@ -94,4 +95,26 @@ describe Facter::Util::Config do
     end
 
   end
+
+  describe "override_binary_dir" do
+    it "should return the default value for linux" do
+      Facter::Util::Config.stubs(:is_windows?).returns(false)
+      Facter::Util::Config.setup_default_override_binary_dir
+      Facter::Util::Config.override_binary_dir.should == "/opt/puppetlabs/puppet/bin"
+    end
+
+    it "should return nil for windows" do
+      Facter::Util::Config.stubs(:is_windows?).returns(true)
+      Facter::Util::Config.setup_default_override_binary_dir
+      Facter::Util::Config.override_binary_dir.should == nil
+    end
+
+    it "should output new values when explicitly set" do
+      Facter::Util::Config.setup_default_override_binary_dir
+      new_value = '/usr/share/newdir'
+      Facter::Util::Config.override_binary_dir = new_value
+      Facter::Util::Config.override_binary_dir.should == new_value
+    end
+  end
+
 end

data/spec/unit/util/operatingsystem_spec.rb

@@ -19,6 +19,21 @@ describe Facter::Util::Operatingsystem do
       })
     end
 
+    it "correctly parses the file on CoreOS Linux"  do
+      values = described_class.os_release(my_fixture('coreos.txt'))
+
+      expect(values).to eq({
+        'NAME' => "CoreOS",
+        'VERSION_ID' => "575.0.0",
+        'VERSION' => "575.0.0",
+        'PRETTY_NAME' => "CoreOS 575.0.0",
+        'ID' => "coreos",
+        'HOME_URL' => "https://coreos.com/",
+        'BUG_REPORT_URL' => "https://github.com/coreos/bugs/issues",
+        'ANSI_COLOR' => "1;32",
+      })
+    end
+
     it "correctly parses the file on Sabayon" do
       values = described_class.os_release(my_fixture('sabayon.txt'))
 

data/spec/unit/util/virtual_spec.rb

@@ -278,10 +278,15 @@ describe Facter::Util::Virtual do
     mockfile
   end
 
-  shared_examples_for "virt-what" do |kernel, path, null_device|
+  shared_examples_for "virt-what" do |kernel, path, null_device, override_location|
     before(:each) do
       Facter.fact(:kernel).stubs(:value).returns(kernel)
-      Facter::Core::Execution.expects(:which).with("virt-what").returns(path)
+      if override_location
+        Facter::Core::Execution.expects(:which).with(File.join(Facter::Util::Config.override_binary_dir, "virt-what")).returns(path)
+      else
+        Facter::Core::Execution.expects(:which).with(File.join(Facter::Util::Config.override_binary_dir, "virt-what")).returns(nil)
+        Facter::Core::Execution.expects(:which).with("virt-what").returns(path)
+      end
       Facter::Core::Execution.expects(:exec).with("#{path} 2>#{null_device}")
     end
 
@@ -291,23 +296,28 @@ describe Facter::Util::Virtual do
   end
 
   context "on linux" do
-    it_should_behave_like "virt-what", "linux", "/usr/bin/virt-what", "/dev/null"
-
-    it "should strip out warnings on stdout from virt-what" do
-      virt_what_warning = "virt-what: this script must be run as root"
-      Facter.fact(:kernel).stubs(:value).returns('linux')
-      Facter::Core::Execution.expects(:which).with('virt-what').returns "/usr/bin/virt-what"
-      Facter::Core::Execution.expects(:exec).with('/usr/bin/virt-what 2>/dev/null').returns virt_what_warning
-      Facter::Util::Virtual.virt_what.should_not match /^virt-what: /
+    describe "override binary dir doesn't exist" do
+      it_should_behave_like "virt-what", "linux", "/usr/bin/virt-what", "/dev/null", true
+      it_should_behave_like "virt-what", "linux", "/usr/bin/virt-what", "/dev/null", false
+
+      it "should strip out warnings on stdout from virt-what" do
+        virt_what_warning = "virt-what: this script must be run as root"
+        Facter.fact(:kernel).stubs(:value).returns('linux')
+        Facter::Core::Execution.expects(:which).with(File.join(Facter::Util::Config.override_binary_dir, "virt-what")).returns(nil)
+        Facter::Core::Execution.expects(:which).with('virt-what').returns "/usr/bin/virt-what"
+        Facter::Core::Execution.expects(:exec).with('/usr/bin/virt-what 2>/dev/null').returns virt_what_warning
+        Facter::Util::Virtual.virt_what.should_not match /^virt-what: /
+      end
     end
   end
 
   context "on unix" do
-    it_should_behave_like "virt-what", "unix", "/usr/bin/virt-what", "/dev/null"
+    it_should_behave_like "virt-what", "unix", "/usr/bin/virt-what", "/dev/null", true
+    it_should_behave_like "virt-what", "unix", "/usr/bin/virt-what", "/dev/null", false
   end
 
   context "on windows" do
-    it_should_behave_like "virt-what", "windows", 'c:\windows\system32\virt-what', "NUL"
+    it_should_behave_like "virt-what", "windows", 'c:\windows\system32\virt-what', "NUL", false
   end
 
   describe '.lxc?' do

data/spec/unit/util/xendomains_spec.rb

@@ -7,60 +7,108 @@ describe Facter::Util::Xendomains do
 
   let(:xen0_domains) { my_fixture_read("xendomains") }
 
-  describe "when the xl command is present" do
+  describe "when the xen-toolstack command is present" do
     before do
-      Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xl').returns('/usr/sbin/xl')
+      File.expects(:file?).with('/usr/lib/xen-common/bin/xen-toolstack').returns true
     end
 
-    describe "and the xm command is not present" do
-
+    describe "and the xen-toolstack returns xl" do
       before do
-        Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns(nil)
-        Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xm list 2>/dev/null').never
+        Facter::Util::Resolution.stubs(:exec).with('/usr/lib/xen-common/bin/xen-toolstack').returns('/usr/sbin/xl')
       end
 
       it "lists the domains running on Xen0 with the 'xl' command" do
         Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xl list 2>/dev/null').returns(xen0_domains)
         Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
       end
+
     end
 
-    describe "and the xm command is also present" do
+    describe "and the xen-toolstack returns xm" do
       before do
-        Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns('/usr/bin/xm')
-        Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xm list 2>/dev/null').never
+        Facter::Util::Resolution.stubs(:exec).with('/usr/lib/xen-common/bin/xen-toolstack').returns('/usr/sbin/xm')
       end
 
-      it "prefers xl over xm" do
-        Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xl list 2>/dev/null').returns(xen0_domains)
+      it "lists the domains running on Xen0 with the 'xm' command" do
+        Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains)
         Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
       end
+
     end
+
+    describe "and the xen-toolstack returns nil" do
+      before do
+        Facter::Util::Resolution.stubs(:exec).with('/usr/lib/xen-common/bin/xen-toolstack').returns(nil)
+      end
+
+      it "returns nil" do
+        Facter::Util::Xendomains.get_domains.should == nil
+      end
+
+    end
+
   end
 
-  describe "when xl is not present" do
+  describe "when the xen-toolstack command is not present" do
     before do
-      Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xl').returns(nil)
-      Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xl list 2>/dev/null').never
+      File.expects(:file?).with('/usr/lib/xen-common/bin/xen-toolstack').returns false
     end
 
-    describe "and the xm command is present" do
+    describe "and the xl command is present" do
       before do
-        Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns('/usr/sbin/xm')
+        Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xl').returns('/usr/sbin/xl')
       end
 
-      it "lists the domains running on Xen0 with the 'xm' command" do
-        Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains)
-        Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
+      describe "and the xm command is not present" do
+
+        before do
+          Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns(nil)
+          Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xm list 2>/dev/null').never
+        end
+
+        it "lists the domains running on Xen0 with the 'xl' command" do
+          Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xl list 2>/dev/null').returns(xen0_domains)
+          Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
+        end
+      end
+
+      describe "and the xm command is also present" do
+        before do
+          Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns('/usr/bin/xm')
+          Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xm list 2>/dev/null').never
+        end
+
+        it "prefers xl over xm" do
+          Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xl list 2>/dev/null').returns(xen0_domains)
+          Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
+        end
+      end
+    end
+
+    describe "when xl is not present" do
+      before do
+        Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xl').returns(nil)
+        Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xl list 2>/dev/null').never
+      end
+
+      describe "and the xm command is present" do
+        before do
+          Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns('/usr/sbin/xm')
+        end
+
+        it "lists the domains running on Xen0 with the 'xm' command" do
+          Facter::Util::Resolution.expects(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains)
+          Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
+        end
       end
     end
-  end
 
-  describe "neither xl or xm are present" do
-    it "returns nil" do
-      Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xl').returns(nil)
-      Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns(nil)
-      Facter::Util::Xendomains.get_domains.should == nil
+    describe "neither xl or xm are present" do
+      it "returns nil" do
+        Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xl').returns(nil)
+        Facter::Util::Resolution.stubs(:which).with('/usr/sbin/xm').returns(nil)
+        Facter::Util::Xendomains.get_domains.should == nil
+      end
     end
   end
 end