facter 4.0.23 → 4.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4c01aab49dd7e09e17c3ed32dd16db6a14095a160f398443ec3c12f8a99ac0f
-  data.tar.gz: 31b07ae25da27da958aa2d78ee4b2526092dd38f93564fbfbdd305fc9918fe72
+  metadata.gz: 2a87a5fda1ec732928ca868e4df803b7d0b9d68d95f1efd366eeb6497550beff
+  data.tar.gz: b324cde69b928d3a21b43d4f40a973b0086a56eba1a30eb5392f1d515513ee52
 SHA512:
-  metadata.gz: ed83b3e0dbc7d4f81d9816b2e2820c20d096b8fdfa6b72c448f645de8ea437441f768b3730087f56d92aeca67a9001f35df4b3206a9c7e3162bef7fdc3ab267d
-  data.tar.gz: e656c9cedecb2c7fb61a30e452ffd1e1c065e16960c1d5ca2a4b9a3c3e34714741ce42874aace47b16a92ce9501bf33306eb517dd2ac5625ef575e0b5c89ede5
+  metadata.gz: bd84d157b62b33d1425d971eed5b94dd3c0b4f10e98755bb417b511c4baf5a8f2b48ee53c2ec2a80c7052023b324303ea965231a8bebaa66ca0c9e4553425d84
+  data.tar.gz: 8f9ff642fd2214cc77e6e8f7c21287b2265f0a604eba6b707a201e9eef2e77215451562e388f9ef017bc9917219bf58d377bf6e79150cbfa52403569e9ecb23c

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 
 
+## [4.0.24](https://github.com/puppetlabs/facter-ng/tree/4.0.24) (2020-05-26)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.23...4.0.24)
+
+### Added
+
+- \(FACT-2605\) Add vmware resolver [\#525](https://github.com/puppetlabs/facter-ng/pull/525) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2604\) Add virt-what resolver [\#523](https://github.com/puppetlabs/facter-ng/pull/523) ([oanatmaria](https://github.com/oanatmaria))
+
+
+
 ## [4.0.23](https://github.com/puppetlabs/facter-ng/tree/4.0.23) (2020-05-22)
 
 [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.22...4.0.23)

data/VERSION

@@ -1 +1 @@
-4.0.23
+4.0.24

data/lib/facts/linux/virtual.rb

@@ -6,7 +6,8 @@ module Facts
       FACT_NAME = 'virtual'
 
       def call_the_resolver
-        fact_value = check_docker_lxc || check_gce
+        fact_value = check_docker_lxc || check_gce || retrieve_from_virt_what || check_vmware
+
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
 
@@ -18,6 +19,14 @@ module Facts
       def check_docker_lxc
         Facter::Resolvers::DockerLxc.resolve(:vm)
       end
+
+      def check_vmware
+        Facter::Resolvers::Vmware.resolve(:vm)
+      end
+
+      def retrieve_from_virt_what
+        Facter::Resolvers::VirtWhat.resolve(:vm)
+      end
     end
   end
 end

data/lib/resolvers/virt_what.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class VirtWhat < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { retrieve_from_virt_what(fact_name) }
+        end
+
+        def retrieve_from_virt_what(fact_name)
+          output = Facter::Core::Execution.execute('virt-what', logger: log)
+
+          @fact_list[:vm] = determine_xen(output)
+          @fact_list[:vm] ||= determine_other(output)
+          retrieve_vserver unless @fact_list[:vserver]
+
+          @fact_list[fact_name]
+        end
+
+        def determine_xen(output)
+          xen_info = /^xen\n.*/.match(output)
+
+          return unless xen_info
+
+          xen_info = xen_info.to_s
+          return 'xenu' if xen_info =~ /xen-domu/
+          return 'xenhvm' if xen_info =~ /xen-hvm/
+          return 'xen0' if xen_info =~ /xen-dom0/
+        end
+
+        def determine_other(output)
+          other_vm = output.split("\n").first
+          return unless other_vm
+
+          return 'zlinux' if other_vm =~ /ibm_systemz/
+          return retrieve_vserver if other_vm =~ /linux_vserver/
+
+          other_vm
+        end
+
+        def retrieve_vserver
+          proc_status_content = Facter::Util::FileHelper.safe_readlines('/proc/self/status', nil)
+          return unless proc_status_content
+
+          proc_status_content.each do |line|
+            parts = line.split("\s")
+            next unless parts.size.equal?(2)
+
+            next unless parts[0] =~ /^s_context:|^VxID:/
+            return @fact_list[:vserver] = 'vserver_host' if parts[1] == '0'
+
+            return @fact_list[:vserver] = 'vserver'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/vmware.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Vmware < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { vmware_command(fact_name) }
+        end
+
+        def vmware_command(fact_name)
+          output = Facter::Core::Execution.execute('vmware -v', logger: log)
+          return if output.empty?
+
+          parts = output.split("\s")
+          return unless parts.size.equal?(2)
+
+          @fact_list[:vm] = "#{parts[0].downcase}_#{parts[1].downcase}"
+          @fact_list[fact_name]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.23
+  version: 4.0.24
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -733,6 +733,8 @@ files:
 - lib/resolvers/utils/fingerprint.rb
 - lib/resolvers/utils/ssh.rb
 - lib/resolvers/utils/ssh_helper.rb
+- lib/resolvers/virt_what.rb
+- lib/resolvers/vmware.rb
 - lib/resolvers/windows/dmi_bios_resolver.rb
 - lib/resolvers/windows/dmi_computersystem_resolver.rb
 - lib/resolvers/windows/ffi/ffi.rb