facter 4.2.6 → 4.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0c594d7e1c0b1242696bfff37bb65cfa378f08a80b79d68cc03ec277a3622c9
-  data.tar.gz: ba4ed34667a934a131241583e0c520460e6e94b6ff31e78c0d02851c9064e752
+  metadata.gz: c1f5a8cf03ae84a5ed4d4c960fe36d5f99cee36fee108af8e093c841149e6b2b
+  data.tar.gz: 40e0d6da9df3b0a6a9bd862c4beb3059e1bd5b24b6e779330afe965b13f9d05d
 SHA512:
-  metadata.gz: 066123daac0a1b601f3c480bfef30aee5d481b1f810b0d99f4c5542493a1aba83f8a600d462b935347aa65f967417dc4522669ffdba54e36cf1ebaf6879cdaa1
-  data.tar.gz: 48133fe43104a4e0bb1fd47d230ecd6debed1bf8b0eeae1096aab5e0324272e8162efde1fc6804a0c1afd5840b08d863c5ee9c953f731f564f7f69976ec976e8
+  metadata.gz: a269678bb8f2c68be05c0ca761eb7a933f9a0651768408d0db7d07e2e80d43ce5bdc98cacc050935fdb3c4f31058711b8c619d73f7df657cb79eae0f34e900e2
+  data.tar.gz: 9ff5b843060429d560e4ed3dcaf4add5424d25d1cceabf31e67981161f4f25a68f7f9a4414087cc3a97aac247f5d1d62524b68413d91e222bb9694257c2d0b2f

data/lib/facter/facts/linux/cloud/provider.rb

@@ -10,6 +10,8 @@ module Facts
           provider = case Facter::Util::Facts::Posix::VirtualDetector.platform
                      when 'hyperv'
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                     when 'kvm', 'xen'
+                       'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

data/lib/facter/facts/linux/hypervisors/kvm.rb

@@ -35,13 +35,15 @@ module Facts
         end
 
         def kvm?
+          product_name = discover_hypervisor
           bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
           @log.debug("Detected bios vendor: #{bios_vendor}")
 
           Facter::Resolvers::VirtWhat.resolve(:vm) == 'kvm' ||
             Facter::Resolvers::Lspci.resolve(:vm) == 'kvm' ||
             bios_vendor&.include?('Amazon EC2') ||
-            bios_vendor&.include?('Google')
+            bios_vendor&.include?('Google') ||
+            product_name&.include?('OpenStack')
         end
 
         def discover_provider

data/lib/facter/facts/windows/cloud/provider.rb

@@ -11,6 +11,8 @@ module Facts
           provider = case virtual
                      when 'hyperv'
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                     when 'kvm', 'xen'
+                       'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

data/lib/facter/resolvers/disks.rb

@@ -34,7 +34,7 @@ module Facter
 
           def lsblk(option, disk)
             result = Facter::Core::Execution.execute(
-              "/usr/bin/lsblk -dn -o #{option} /dev/#{disk}", on_fail: '', timeout: 1
+              "lsblk -dn -o #{option} /dev/#{disk}", on_fail: '', timeout: 1
             ).strip
             result.empty? ? nil : result
           end

data/lib/facter/resolvers/ec2.rb

@@ -20,7 +20,7 @@ module Facter
         def read_facts(fact_name)
           @fact_list[:metadata] = {}
           query_for_metadata(EC2_METADATA_ROOT_URL, @fact_list[:metadata])
-          @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip
+          @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
           @fact_list[fact_name]
         end
 

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.2.6' unless defined?(VERSION)
+  VERSION = '4.2.9' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.2.9
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1094,7 +1094,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Facter, a system inventory tool