facter 4.2.6 → 4.2.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/facter/facts/linux/hypervisors/kvm.rb +3 -1
- data/lib/facter/resolvers/ec2.rb +1 -1
- data/lib/facter/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5648b99a92b05c556d728186e4df5fed506b8edf3ca2ac1e77708a2ebe9b8359
|
|
4
|
+
data.tar.gz: 9e58e46ab92d8d4aeffcf54a4b13b8d25ca751e08669f73c067a245cb96bdd93
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 467e8ef226865d0ae6d88fca05bc8c44e4dbbc10dec1e8117947e68dac09b5046878eaf3e2a45d1dd572b9b3b76f44ff14a7c62653df83854ee38172a0e576cf
|
|
7
|
+
data.tar.gz: 71405bf059cbba0572136a4d67db8700542f62f668a4f50f7fe99a818f82bc5f114bb8f12baa3a86be5bd59e50337e23e34f485dd5bae522c0d0a8ee8206a928
|
|
@@ -35,13 +35,15 @@ module Facts
|
|
|
35
35
|
end
|
|
36
36
|
|
|
37
37
|
def kvm?
|
|
38
|
+
product_name = discover_hypervisor
|
|
38
39
|
bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
|
|
39
40
|
@log.debug("Detected bios vendor: #{bios_vendor}")
|
|
40
41
|
|
|
41
42
|
Facter::Resolvers::VirtWhat.resolve(:vm) == 'kvm' ||
|
|
42
43
|
Facter::Resolvers::Lspci.resolve(:vm) == 'kvm' ||
|
|
43
44
|
bios_vendor&.include?('Amazon EC2') ||
|
|
44
|
-
bios_vendor&.include?('Google')
|
|
45
|
+
bios_vendor&.include?('Google') ||
|
|
46
|
+
product_name&.include?('OpenStack')
|
|
45
47
|
end
|
|
46
48
|
|
|
47
49
|
def discover_provider
|
data/lib/facter/resolvers/ec2.rb
CHANGED
|
@@ -20,7 +20,7 @@ module Facter
|
|
|
20
20
|
def read_facts(fact_name)
|
|
21
21
|
@fact_list[:metadata] = {}
|
|
22
22
|
query_for_metadata(EC2_METADATA_ROOT_URL, @fact_list[:metadata])
|
|
23
|
-
@fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip
|
|
23
|
+
@fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
|
|
24
24
|
@fact_list[fact_name]
|
|
25
25
|
end
|
|
26
26
|
|
data/lib/facter/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: facter
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.2.
|
|
4
|
+
version: 4.2.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2022-01-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|