ohai 16.7.37 → 16.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39d6064d1c93ab4dac377f1883213fad35872ee08ac0c2b97801b5d96da1a1df
-  data.tar.gz: 5837422d08995fd7057e84d496d85b11514bd51b6b0d391b282fb3612fb083bc
+  metadata.gz: 168be10defab5e91f8da06ce4d101a461ed13a2051d4b6901c3039571c7a3066
+  data.tar.gz: 8783ddbdc49208974d09cfc7e708760402248719baaf2a1a8dce28e8a14902bc
 SHA512:
-  metadata.gz: d58037d84d3f6066b86561940dffe8b812d89ef6e75a7a0a8a843affccb7b6fc98e29795d2bd62ce48b396eefc71901423e198274d5474c95e1fb189101f4992
-  data.tar.gz: cc8c6cbd38084685fe8cb8dccdc3f5c469829b0798c562fb8803dc37d0c3aacf2a844781689ef0f3a5796929f43951d59b083531fea4ed08a46a07395bb8a06d
+  metadata.gz: 5781908ba60b11f68397c10693d6c084e1eb021dc5a6b1348448b712225322295cc5b510dc41e9feecbf1a463d23f47773428ce540c138b43a2c6fd9ced079a4
+  data.tar.gz: 50a9ba71dca6681a84536c1f443653dc4d78172ded2fffa9022ad8ed8e577a0dc3e1bc6329b021438fe3ee6d2d62d1154093928fb3fb53957df38363f0bf92c2

data/lib/ohai/plugins/grub2.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2020 Facebook
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Grub2) do
+  provides "grub2/environment"
+  optional true
+
+  collect_data(:dragonflybsd, :freebsd, :linux, :netbsd) do
+    editenv_path = which("grub2-editenv")
+    if editenv_path
+      editenv_out = shell_out("#{editenv_path} list")
+
+      grub2 Mash.new unless grub2
+      grub2[:environment] ||= Mash.new
+
+      editenv_out.stdout.each_line do |line|
+        key, val = line.split("=", 2)
+        grub2[:environment][key] = val.strip
+      end
+    else
+      logger.trace("Plugin Grub2: Could not find grub2-editenv. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/plugins/linode.rb

@@ -18,31 +18,38 @@
 Ohai.plugin(:Linode) do
   provides "linode"
 
-  depends "kernel"
+  depends "domain"
   depends "network/interfaces"
 
-  # Checks for matching linode kernel name
+  # Checks to see if the node is in the members.linode.com domain
   #
-  # Returns true or false
-  def has_linode_kernel?
-    if ( kernel_data = kernel )
-      kernel_data[:release].split("-").last.include?("linode")
-    end
+  # @return [Boolean]
+  #
+  def has_linode_domain?
+    domain&.include?("linode")
+  end
+
+  # Checks for linode mirrors in the apt sources.list file
+  #
+  # @return [Boolean]
+  #
+  def has_linode_apt_repos?
+    file_exist?("/etc/apt/sources.list") && file_read("/etc/apt/sources.list").include?("linode")
   end
 
   # Identifies the linode cloud by preferring the hint, then
   #
-  # Returns true or false
+  # @return [Boolean]
+  #
   def looks_like_linode?
-    hint?("linode") || has_linode_kernel?
+    hint?("linode") || has_linode_domain? || has_linode_apt_repos?
   end
 
-  # Names linode ip address
+  # Alters linode mash with new interface based on name parameter
   #
-  # name - symbol of ohai name (e.g. :public_ip)
-  # eth - Interface name (e.g. :eth0)
+  # @param [Symbol] name Ohai name (e.g. :public_ip)
+  # @param [Symbol] eth Interface name (e.g. :eth0)
   #
-  # Alters linode mash with new interface based on name parameter
   def get_ip_address(name, eth)
     if ( eth_iface = network[:interfaces][eth] )
       eth_iface[:addresses].each do |key, info|

data/lib/ohai/plugins/linux/lspci.rb

@@ -19,7 +19,6 @@
 # limitations under the License.
 
 Ohai.plugin(:Lspci) do
-  depends "platform"
   provides "pci"
   optional true
 

data/lib/ohai/plugins/scsi.rb

@@ -18,7 +18,6 @@
 #
 
 Ohai.plugin(:Lsscsi) do
-  depends "platform"
   provides "scsi"
   optional true
 

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "16.7.37"
+  VERSION = "16.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 16.7.37
+  version: 16.8.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -285,6 +285,7 @@ files:
 - lib/ohai/plugins/gce.rb
 - lib/ohai/plugins/go.rb
 - lib/ohai/plugins/groovy.rb
+- lib/ohai/plugins/grub2.rb
 - lib/ohai/plugins/haskell.rb
 - lib/ohai/plugins/hostname.rb
 - lib/ohai/plugins/init_package.rb