ohai 8.10.0 → 8.11.1

data/lib/ohai/mixin/string.rb

@@ -23,7 +23,7 @@ class String
   # This should implement the same functionality as underscore method in
   # ActiveSupport::CoreExtensions::String::Inflections
   def wmi_underscore
-     self.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-     gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase
+    self.gsub(/::/, "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+      gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-", "_").downcase
   end
 end

data/lib/ohai/plugin_config.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'ohai/exception'
+require "ohai/exception"
 
 module Ohai
   class PluginConfig < Hash

data/lib/ohai/plugins/aix/cpu.rb

@@ -27,7 +27,7 @@ Ohai.plugin(:CPU) do
     cpu[:total] = shell_out("pmcycles -m").stdout.lines.length
 
     # The below is only relevent on an LPAR
-    if shell_out('uname -W').stdout.strip == "0"
+    if shell_out("uname -W").stdout.strip == "0"
 
       # At least one CPU will be available, but we'll wait to increment this later.
       cpu[:available] = 0
@@ -36,7 +36,7 @@ Ohai.plugin(:CPU) do
       #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
       #on AIX number of cores and processors are considered same
       cpu[:real] = cpu[:cores] = cpudevs.length
-      cpudevs.each.with_index do |c,i|
+      cpudevs.each.with_index do |c, i|
         name, status, location = c.split
         index = i.to_s
         cpu[index] = Mash.new

data/lib/ohai/plugins/aix/filesystem.rb

@@ -54,14 +54,14 @@ Ohai.plugin(:Filesystem) do
         oldie[key] ||= Mash.new
         oldie[key][:mount] = fields[1]
         oldie[key][:fs_type] = fields[2]
-        oldie[key][:mount_options] = fields[6].split(',')
+        oldie[key][:mount_options] = fields[6].split(",")
       # entries occupying the 'Node' column parsed here
       else
         key = fields[0] + ":" + fields[1]
         oldie[key] ||= Mash.new
         oldie[key][:mount] = fields[1]
         oldie[key][:fs_type] = fields[3]
-        oldie[key][:mount_options] = fields[7].split(',')
+        oldie[key][:mount_options] = fields[7].split(",")
       end
     end
     oldie

data/lib/ohai/plugins/aix/memory.rb

@@ -30,7 +30,7 @@ Ohai.plugin(:Memory) do
     memory[:free] = "#{free_in_mb.to_i * 1024}kB"
 
     swapinfo = shell_out("swap -s").stdout.split #returns swap info in 4K blocks
-    memory[:swap]['total'] = "#{(swapinfo[2].to_i) * 4}kB"
-    memory[:swap]['free'] = "#{(swapinfo[10].to_i) * 4}kB"
+    memory[:swap]["total"] = "#{(swapinfo[2].to_i) * 4}kB"
+    memory[:swap]["free"] = "#{(swapinfo[10].to_i) * 4}kB"
   end
 end

data/lib/ohai/plugins/aix/network.rb

@@ -19,7 +19,7 @@
 #
 
 Ohai.plugin(:Network) do
-  require 'ipaddr'
+  require "ipaddr"
 
   provides "network", "counters/network", "macaddress"
 
@@ -27,7 +27,7 @@ Ohai.plugin(:Network) do
   def hex_to_dec_netmask(netmask)
     # example '0xffff0000' -> '255.255.0.0'
     dec = netmask[2..3].to_i(16).to_s(10)
-    [4,6,8].each { |n| dec = dec + "." + netmask[n..n+1].to_i(16).to_s(10) }
+    [4, 6, 8].each { |n| dec = dec + "." + netmask[n..n + 1].to_i(16).to_s(10) }
     dec
   end
 
@@ -53,7 +53,7 @@ Ohai.plugin(:Network) do
       # :default_interface, :default_gateway - route -n get 0
       so = shell_out("netstat -rn |grep default")
       so.stdout.lines.each do |line|
-        items = line.split(' ')
+        items = line.split(" ")
         if items[0] == "default"
           network[:default_gateway] = items[1]
           network[:default_interface] = items[5]
@@ -68,12 +68,12 @@ Ohai.plugin(:Network) do
       interface = splat[0]
       line = splat[1..-1][0]
       iface[interface] = Mash.new
-      iface[interface][:state] = (line.include?("<UP,") ? 'up' : 'down')
+      iface[interface][:state] = (line.include?("<UP,") ? "up" : "down")
 
       intraface.lines.each do |lin|
         case lin
         when /flags=\S+<(\S+)>/
-          iface[interface][:flags] = $1.split(',')
+          iface[interface][:flags] = $1.split(",")
           iface[interface][:metric] = $1 if lin =~ /metric\s(\S+)/
         else
           # We have key value pairs.
@@ -103,9 +103,9 @@ Ohai.plugin(:Network) do
           else
             # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
             properties = lin.split
-            n = properties.length/2 - 1
+            n = properties.length / 2 - 1
             (0..n).each do |i|
-              iface[interface][properties[i*2]] = properties[(i*2+1)]
+              iface[interface][properties[i * 2]] = properties[(i * 2 + 1)]
             end
           end
         end
@@ -120,7 +120,7 @@ Ohai.plugin(:Network) do
           macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
         end
       end
-    end  #ifconfig stdout
+    end #ifconfig stdout
 
     # Query routes information
     %w{inet inet6}.each do |family|
@@ -130,7 +130,7 @@ Ohai.plugin(:Network) do
           interface = $6
           iface[interface][:routes] = Array.new unless iface[interface][:routes]
           iface[interface][:routes] << Mash.new( :destination => $1, :family => family,
-           :via => $2, :flags => $3)
+                                                 :via => $2, :flags => $3)
         end
       end
     end
@@ -151,4 +151,3 @@ Ohai.plugin(:Network) do
     network["interfaces"] = iface
   end
 end
-

data/lib/ohai/plugins/aix/os.rb

@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/os'
+require "ohai/mixin/os"
 
 Ohai.plugin(:OS) do
   provides "os", "os_version"
-  depends 'kernel'
+  depends "kernel"
 
   collect_data(:aix) do
     os collect_os

data/lib/ohai/plugins/aix/uptime.rb

@@ -21,14 +21,14 @@ Ohai.plugin(:Uptime) do
   provides "uptime", "uptime_seconds"
 
   collect_data(:aix) do
-    require 'date'
+    require "date"
     # Example output:
     # $ who -b
     #   .       system boot  Jul  9 17:51
-    so = shell_out('who -b')
+    so = shell_out("who -b")
     so.stdout.lines.each do |line|
       if line =~ /.* boot (.+)/
-        uptime_seconds Time.now.to_i - DateTime.parse($1 + " #{Time.now.zone}").strftime('%s').to_i
+        uptime_seconds Time.now.to_i - DateTime.parse($1 + " #{Time.now.zone}").strftime("%s").to_i
         uptime seconds_to_human(uptime_seconds)
         break
       end

data/lib/ohai/plugins/aix/virtualization.rb

@@ -56,63 +56,63 @@ Ohai.plugin(:Virtualization) do
 
           sections.each do |line|
             case title
-            when 'network'
+            when "network"
               next if line =~ /^Interface|^---/
               splat = line.strip.split
               key   = splat[0].downcase
               value = {
-                        'address'   => splat[1],
-                        'netmask'   => splat[2],
-                        'broadcast' => splat[3],
+                        "address"   => splat[1],
+                        "netmask"   => splat[2],
+                        "broadcast" => splat[3],
                       }
               wpars[wpar_name][title][key] = value
-            when 'user-specified routes'
+            when "user-specified routes"
               next if line =~ /^Type|^---/
               splat = line.strip.split
               key   = splat[2].downcase
               value = {
-                        'destination' => splat[0],
-                        'gateway'     => splat[1],
+                        "destination" => splat[0],
+                        "gateway"     => splat[1],
                       }
               wpars[wpar_name][title][key] = value
-            when 'file systems'
+            when "file systems"
               next if line =~ /^MountPoint|^---/
               splat = line.strip.split
               key = splat[1].downcase
               value = {
-                        'mountpoint' => splat[0],
-                        'device'     => splat[1],
-                        'vfs'     => splat[2],
-                        'options'     => splat[3].split(','),
+                        "mountpoint" => splat[0],
+                        "device"     => splat[1],
+                        "vfs" => splat[2],
+                        "options" => splat[3].split(","),
                       }
               wpars[wpar_name][title][key] = value
-            when 'security settings'
-              privileges ||= ''
-              wpars[wpar_name][title]['Privileges'] ||= []
+            when "security settings"
+              privileges ||= ""
+              wpars[wpar_name][title]["Privileges"] ||= []
 
               if line =~ /^Privileges/
-                privileges << line.split(':')[1].strip
+                privileges << line.split(":")[1].strip
               else
                 privileges << line.strip
               end
 
-              wpars[wpar_name][title]['Privileges'] += privileges.split(',')
-            when 'device exports'
+              wpars[wpar_name][title]["Privileges"] += privileges.split(",")
+            when "device exports"
               next if line =~ /^Name|^---/
               splat = line.strip.split
               key = splat[0].downcase
               value = {
-                        'type' => splat[1],
-                        'status'     => splat[2],
+                        "type" => splat[1],
+                        "status" => splat[2],
                       }
               wpars[wpar_name][title][key] = value
             else
               # key-value pairs are handled here
               # such as GENERAL and RESOURCE-
               # CONTROL
-              splat = line.strip.split(':')
+              splat = line.strip.split(":")
               key   = splat[0].downcase
-              value = splat[1..-1].join(', ').strip
+              value = splat[1..-1].join(", ").strip
               value = value.empty? ? nil : value
               case value
               when "yes"
@@ -136,7 +136,7 @@ Ohai.plugin(:Virtualization) do
 
         top_level.each do |attribute|
           evalstr = "wpars['#{wpar_name}']"
-          breadcrumb = attribute.split('.')
+          breadcrumb = attribute.split(".")
           breadcrumb.each do |node|
             evalstr << "[\'#{node}\']"
           end

data/lib/ohai/plugins/azure.rb

@@ -19,17 +19,44 @@ Ohai.plugin(:Azure) do
 
   collect_data do
     # The azure hints are populated by the knife plugin for Azure.
-    # The project is located at https://github.com/opscode/knife-azure
+    # The project is located at https://github.com/chef/knife-azure
     # Please see the lib/chef/knife/azure_server_create.rb file in that
     # project for details
-    azure_metadata_from_hints = hint?('azure')
+    azure_metadata_from_hints = hint?("azure")
     if azure_metadata_from_hints
-      Ohai::Log.debug("azure_metadata_from_hints is present.")
+      Ohai::Log.debug("azure plugin: azure_metadata_from_hints is present.")
+      azure Mash.new
+      azure_metadata_from_hints.each { |k, v| azure[k] = v }
+    elsif has_waagent? || has_dhcp_option_245?
+      Ohai::Log.debug("azure plugin: No hints present, but system appears to be on azure.")
       azure Mash.new
-      azure_metadata_from_hints.each {|k, v| azure[k] = v }
     else
-      Ohai::Log.debug("No hints present for azure.")
+      Ohai::Log.debug("azure plugin: No hints present for azure and doesn't appear to be azure.")
       false
     end
   end
+
+  # check for either the waagent or the unknown-245 DHCP option that Azure uses
+  # http://blog.mszcool.com/index.php/2015/04/detecting-if-a-virtual-machine-runs-in-microsoft-azure-linux-windows-to-protect-your-software-when-distributed-via-the-azure-marketplace/
+  def has_waagent?
+    if File.exist?("/usr/sbin/waagent") || Dir.exist?('C:\WindowsAzure')
+      Ohai::Log.debug("azure plugin: Found waagent used by MS Azure.")
+      return true
+    end
+  end
+
+  def has_dhcp_option_245?
+    has_245 = false
+    if File.exist?("/var/lib/dhcp/dhclient.eth0.leases")
+      File.open("/var/lib/dhcp/dhclient.eth0.leases").each do |line|
+        if line =~ /unknown-245/
+          Ohai::Log.debug("azure plugin: Found unknown-245 DHCP option used by MS Azure.")
+          has_245 = true
+          break
+        end
+      end
+    end
+    return has_245
+  end
+
 end

data/lib/ohai/plugins/bsd/virtualization.rb

@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/dmi_decode'
+require "ohai/mixin/dmi_decode"
 
 include Ohai::Mixin::DmiDecode
 
 Ohai.plugin(:Virtualization) do
-  provides 'virtualization'
+  provides "virtualization"
 
   collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do
 
@@ -33,14 +33,14 @@ Ohai.plugin(:Virtualization) do
     if so.stdout.split($/)[0].to_i == 1
       virtualization[:system] = "jail"
       virtualization[:role] = "guest"
-      virtualization[:systems][:jail] = 'guest'
+      virtualization[:systems][:jail] = "guest"
     end
 
-    so = shell_out('jls -n')
-    if (so.stdout || '').lines.count >= 1
-      virtualization[:system] = 'jail'
-      virtualization[:role] = 'host'
-      virtualization[:systems][:jail] = 'host'
+    so = shell_out("jls -n")
+    if (so.stdout || "").lines.count >= 1
+      virtualization[:system] = "jail"
+      virtualization[:role] = "host"
+      virtualization[:systems][:jail] = "host"
     end
 
     # detect from modules
@@ -48,32 +48,32 @@ Ohai.plugin(:Virtualization) do
     so.stdout.lines do |line|
       case line
       when /vboxdrv/
-        virtualization[:system] = 'vbox'
-        virtualization[:role] = 'host'
-        virtualization[:systems][:vbox] = 'host'
+        virtualization[:system] = "vbox"
+        virtualization[:role] = "host"
+        virtualization[:systems][:vbox] = "host"
       when /vboxguest/
-        virtualization[:system] = 'vbox'
-        virtualization[:role] = 'guest'
-        virtualization[:systems][:vbox] = 'guest'
+        virtualization[:system] = "vbox"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:vbox] = "guest"
       end
     end
 
     # Detect KVM/QEMU from cpu, report as KVM
     # hw.model: QEMU Virtual CPU version 0.9.1
-    so = shell_out('sysctl -n hw.model')
+    so = shell_out("sysctl -n hw.model")
     if so.stdout.split($/)[0] =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
-      virtualization[:system] = 'kvm'
-      virtualization[:role] = 'guest'
-      virtualization[:systems][:kvm] = 'guest'
+      virtualization[:system] = "kvm"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:kvm] = "guest"
     end
 
     # parse dmidecode to discover various virtualization guests
-    if File.exist?('/usr/local/sbin/dmidecode') || File.exist?('/usr/pkg/sbin/dmidecode')
-      guest = guest_from_dmi(shell_out('dmidecode').stdout)
+    if File.exist?("/usr/local/sbin/dmidecode") || File.exist?("/usr/pkg/sbin/dmidecode")
+      guest = guest_from_dmi(shell_out("dmidecode").stdout)
       if guest
         virtualization[:system] = guest
-        virtualization[:role] = 'guest'
-        virtualization[:systems][guest.to_sym] = 'guest'
+        virtualization[:role] = "guest"
+        virtualization[:systems][guest.to_sym] = "guest"
       end
     end
   end

data/lib/ohai/plugins/c.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'rbconfig'
+require "rbconfig"
 
 Ohai.plugin(:C) do
   provides "languages/c"

data/lib/ohai/plugins/chef.rb

@@ -21,7 +21,7 @@ Ohai.plugin(:Chef) do
 
   collect_data do
     begin
-      require 'chef/version'
+      require "chef/version"
     rescue Gem::LoadError
       # this catches when you've done a major version bump of ohai, but
       # your chef gem is incompatible, so we can't load it in the same VM

data/lib/ohai/plugins/cloud.rb

@@ -52,22 +52,22 @@ Ohai.plugin(:Cloud) do
     cloud[:public_ipv4] = []
     cloud[:local_ipv4] = []
 
-    public_ips = gce['instance']["networkInterfaces"].collect do |interface|
-      if interface.has_key?('accessConfigs')
-        interface['accessConfigs'].collect{|ac| ac['externalIp']}
+    public_ips = gce["instance"]["networkInterfaces"].collect do |interface|
+      if interface.has_key?("accessConfigs")
+        interface["accessConfigs"].collect { |ac| ac["externalIp"] }
       end
     end.flatten.compact
 
-    private_ips = gce['instance']["networkInterfaces"].collect do |interface|
-      interface['ip']
+    private_ips = gce["instance"]["networkInterfaces"].collect do |interface|
+      interface["ip"]
     end.compact
 
     cloud[:public_ips] += public_ips
     cloud[:private_ips] += private_ips
-    cloud[:public_ipv4] +=  public_ips
+    cloud[:public_ipv4] += public_ips
     cloud[:public_hostname] = nil
     cloud[:local_ipv4] += private_ips
-    cloud[:local_hostname] = gce['instance']['hostname']
+    cloud[:local_hostname] = gce["instance"]["hostname"]
     cloud[:provider] = "gce"
   end
 
@@ -86,12 +86,12 @@ Ohai.plugin(:Cloud) do
 
   # Fill cloud hash with ec2 values
   def get_ec2_values
-    cloud[:public_ips] << ec2['public_ipv4']
-    cloud[:private_ips] << ec2['local_ipv4']
-    cloud[:public_ipv4] = ec2['public_ipv4']
-    cloud[:public_hostname] = ec2['public_hostname']
-    cloud[:local_ipv4] = ec2['local_ipv4']
-    cloud[:local_hostname] = ec2['local_hostname']
+    cloud[:public_ips] << ec2["public_ipv4"]
+    cloud[:private_ips] << ec2["local_ipv4"]
+    cloud[:public_ipv4] = ec2["public_ipv4"]
+    cloud[:public_hostname] = ec2["public_hostname"]
+    cloud[:local_ipv4] = ec2["local_ipv4"]
+    cloud[:local_hostname] = ec2["local_hostname"]
     cloud[:provider] = "ec2"
   end
 
@@ -110,14 +110,14 @@ Ohai.plugin(:Cloud) do
 
   # Fill cloud hash with rackspace values
   def get_rackspace_values
-    cloud[:public_ips] << rackspace['public_ipv4'] if rackspace['public_ipv4']
-    cloud[:private_ips] << rackspace['local_ipv4'] if rackspace['local_ipv4']
-    cloud[:public_ipv4] = rackspace['public_ipv4']
-    cloud[:public_ipv6] = rackspace['public_ipv6']
-    cloud[:public_hostname] = rackspace['public_hostname']
-    cloud[:local_ipv4] = rackspace['local_ipv4']
-    cloud[:local_ipv6] = rackspace['local_ipv6']
-    cloud[:local_hostname] = rackspace['local_hostname']
+    cloud[:public_ips] << rackspace["public_ipv4"] if rackspace["public_ipv4"]
+    cloud[:private_ips] << rackspace["local_ipv4"] if rackspace["local_ipv4"]
+    cloud[:public_ipv4] = rackspace["public_ipv4"]
+    cloud[:public_ipv6] = rackspace["public_ipv6"]
+    cloud[:public_hostname] = rackspace["public_hostname"]
+    cloud[:local_ipv4] = rackspace["local_ipv4"]
+    cloud[:local_ipv6] = rackspace["local_ipv6"]
+    cloud[:local_hostname] = rackspace["local_hostname"]
     cloud[:provider] = "rackspace"
   end
 
@@ -136,12 +136,12 @@ Ohai.plugin(:Cloud) do
 
   # Fill cloud hash with linode values
   def get_linode_values
-    cloud[:public_ips] << linode['public_ip']
-    cloud[:private_ips] << linode['private_ip']
-    cloud[:public_ipv4] = linode['public_ipv4']
-    cloud[:public_hostname] = linode['public_hostname']
-    cloud[:local_ipv4] = linode['local_ipv4']
-    cloud[:local_hostname] = linode['local_hostname']
+    cloud[:public_ips] << linode["public_ip"]
+    cloud[:private_ips] << linode["private_ip"]
+    cloud[:public_ipv4] = linode["public_ipv4"]
+    cloud[:public_hostname] = linode["public_hostname"]
+    cloud[:local_ipv4] = linode["local_ipv4"]
+    cloud[:local_hostname] = linode["local_hostname"]
     cloud[:provider] = "linode"
   end
 
@@ -159,12 +159,12 @@ Ohai.plugin(:Cloud) do
   end
 
   def get_eucalyptus_values
-    cloud[:public_ips] << eucalyptus['public_ipv4']
-    cloud[:private_ips] << eucalyptus['local_ipv4']
-    cloud[:public_ipv4] = eucalyptus['public_ipv4']
-    cloud[:public_hostname] = eucalyptus['public_hostname']
-    cloud[:local_ipv4] = eucalyptus['local_ipv4']
-    cloud[:local_hostname] = eucalyptus['local_hostname']
+    cloud[:public_ips] << eucalyptus["public_ipv4"]
+    cloud[:private_ips] << eucalyptus["local_ipv4"]
+    cloud[:public_ipv4] = eucalyptus["public_ipv4"]
+    cloud[:public_hostname] = eucalyptus["public_hostname"]
+    cloud[:local_ipv4] = eucalyptus["local_ipv4"]
+    cloud[:local_hostname] = eucalyptus["local_hostname"]
     cloud[:provider] = "eucalyptus"
   end
 
@@ -183,13 +183,13 @@ Ohai.plugin(:Cloud) do
 
   # Fill cloud hash with openstack values
   def get_openstack_values
-    cloud[:public_ips] << openstack['public_ipv4']
-    cloud[:private_ips] << openstack['local_ipv4']
-    cloud[:public_ipv4] = openstack['public_ipv4']
-    cloud[:public_hostname] = openstack['public_hostname']
-    cloud[:local_ipv4] = openstack['local_ipv4']
-    cloud[:local_hostname] = openstack['local_hostname']
-    cloud[:provider] = openstack['provider']
+    cloud[:public_ips] << openstack["public_ipv4"]
+    cloud[:private_ips] << openstack["local_ipv4"]
+    cloud[:public_ipv4] = openstack["public_ipv4"]
+    cloud[:public_hostname] = openstack["public_hostname"]
+    cloud[:local_ipv4] = openstack["local_ipv4"]
+    cloud[:local_hostname] = openstack["local_hostname"]
+    cloud[:provider] = openstack["provider"]
   end
 
   # ----------------------------------------
@@ -208,12 +208,12 @@ Ohai.plugin(:Cloud) do
   # Fill cloud hash with azure values
   def get_azure_values
     cloud[:vm_name] = azure["vm_name"]
-    cloud[:public_ips] << azure['public_ip']
-    cloud[:public_ipv4] = azure['public_ip']
-    cloud[:public_fqdn] = azure['public_fqdn']
-    cloud[:public_hostname] = azure['public_fqdn']
-    cloud[:public_ssh_port] = azure['public_ssh_port'] if azure['public_ssh_port']
-    cloud[:public_winrm_port] = azure['public_winrm_port'] if azure['public_winrm_port']
+    cloud[:public_ips] << azure["public_ip"]
+    cloud[:public_ipv4] = azure["public_ip"]
+    cloud[:public_fqdn] = azure["public_fqdn"]
+    cloud[:public_hostname] = azure["public_fqdn"]
+    cloud[:public_ssh_port] = azure["public_ssh_port"] if azure["public_ssh_port"]
+    cloud[:public_winrm_port] = azure["public_winrm_port"] if azure["public_winrm_port"]
     cloud[:provider] = "azure"
   end
 
@@ -232,17 +232,17 @@ Ohai.plugin(:Cloud) do
 
   # Fill cloud hash with linode values
   def get_digital_ocean_values
-    public_ipv4 = digital_ocean['networks']['v4'].select {|address| address['type'] == 'public'}
-    private_ipv4 = digital_ocean['networks']['v4'].select {|address| address['type'] == 'private'}
-    public_ipv6 = digital_ocean['networks']['v6'].select {|address| address['type'] == 'public'}
-    private_ipv6 = digital_ocean['networks']['v6'].select {|address| address['type'] == 'private'}
-    cloud[:public_ips].concat public_ipv4+public_ipv6
-    cloud[:private_ips].concat private_ipv4+private_ipv6
+    public_ipv4 = digital_ocean["networks"]["v4"].select { |address| address["type"] == "public" }
+    private_ipv4 = digital_ocean["networks"]["v4"].select { |address| address["type"] == "private" }
+    public_ipv6 = digital_ocean["networks"]["v6"].select { |address| address["type"] == "public" }
+    private_ipv6 = digital_ocean["networks"]["v6"].select { |address| address["type"] == "private" }
+    cloud[:public_ips].concat public_ipv4 + public_ipv6
+    cloud[:private_ips].concat private_ipv4 + private_ipv6
     cloud[:public_ipv4] = public_ipv4.first
     cloud[:public_ipv6] = public_ipv6.first
     cloud[:local_ipv4] = private_ipv4.first
     cloud[:local_ipv6] = private_ipv6.first
-    cloud[:public_hostname] = digital_ocean['name']
+    cloud[:public_hostname] = digital_ocean["name"]
     cloud[:provider] = "digital_ocean"
   end
 
@@ -261,15 +261,14 @@ Ohai.plugin(:Cloud) do
 
   # Fill cloud hash with softlayer values
   def get_softlayer_values
-    cloud[:public_ipv4] = softlayer['public_ipv4']
-    cloud[:local_ipv4] = softlayer['local_ipv4']
-    cloud[:public_ips] << softlayer['public_ipv4'] if softlayer['public_ipv4']
-    cloud[:private_ips] << softlayer['local_ipv4'] if softlayer['local_ipv4']
-    cloud[:public_hostname] = softlayer['public_fqdn']
-    cloud[:provider] = 'softlayer'
+    cloud[:public_ipv4] = softlayer["public_ipv4"]
+    cloud[:local_ipv4] = softlayer["local_ipv4"]
+    cloud[:public_ips] << softlayer["public_ipv4"] if softlayer["public_ipv4"]
+    cloud[:private_ips] << softlayer["local_ipv4"] if softlayer["local_ipv4"]
+    cloud[:public_hostname] = softlayer["public_fqdn"]
+    cloud[:provider] = "softlayer"
   end
 
-
   collect_data do
     # setup gce cloud
     if on_gce?