Merge pull request #1703 from szhuga/2.x

[FACT-1822] Add support for EC2 instances based on the Nitro Hypervisor

lib/facter/ec2.rb

@@ -20,7 +20,7 @@
 Facter.define_fact(:ec2_metadata) do
   define_resolution(:rest) do
     confine do
-      Facter.value(:virtual).match /^(xen|kvm)/
+      Facter.value(:virtual).match /^(xen|kvm|nitro)/
     end
 
     @querier = Facter::EC2::Metadata.new
@@ -37,7 +37,7 @@
 Facter.define_fact(:ec2_userdata) do
   define_resolution(:rest) do
     confine do
-      Facter.value(:virtual).match /^(xen|kvm)/
+      Facter.value(:virtual).match /^(xen|kvm|nitro)/
     end
 
     @querier = Facter::EC2::Userdata.new

lib/facter/util/virtual.rb

@@ -142,6 +142,10 @@ def self.gce?
     File.read("/sys/devices/virtual/dmi/id/product_name") =~ /Google/ rescue false
   end
 
+  def self.nitro?
+    File.read("/sys/devices/virtual/dmi/id/bios_vendor") =~ /Amazon/ rescue false
+  end
+
   def self.jail?
     path = case Facter.value(:kernel)
       when "FreeBSD" then "/sbin"

lib/facter/virtual.rb

@@ -149,6 +149,7 @@
     next Facter::Util::Virtual.kvm_type if Facter::Util::Virtual.kvm?
     next "rhev" if Facter::Util::Virtual.rhev?
     next "ovirt" if Facter::Util::Virtual.ovirt?
+    next "nitro" if Facter::Util::Virtual.nitro?
 
     # Parse lspci
     output = Facter::Util::Virtual.lspci
@@ -225,6 +226,10 @@
           result = "xen"
         end
 
+        if result.nil? and computersystem.manufacturer =~ /Amazon/
+          result = "nitro"
+        end
+
         break
       end
       result ||= "physical"