vagrant-ohai 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6960eb2f2d91e26a168eb6366de96a914e02a727
-  data.tar.gz: 763aa6dca8caf8cf6bf363138fe41e66ccc6fb6c
+  metadata.gz: e0d0a9f3a745d2df91a57d898ecbf6aeaeba33e6
+  data.tar.gz: e182c75c43d40941dad353e3d2f8403742527138
 SHA512:
-  metadata.gz: 6adb89801c1bf641ef29f8742c8cfbd18fe942d64e156a92227b5248562e09667d1496db665511c774aee554f655266e39599d2b5483a08465c4fe274422a45e
-  data.tar.gz: dda3aaf1f26d1223a5bb46e764cdd221dfb660a2c1d5dfddb3f5524a32f573a67e3ff7e674247e973eca79ef4f2697f0590e11ee243fcde685e0c5ce1f6af5d5
+  metadata.gz: 7f897a084f8946c0529bf390c2702f9ade73056b6eea10f3f04f7732c82bcf288f5246b57b7cc22daead5673b7ec84b45e561cb52354738ae5fc5c9f53a39c4e
+  data.tar.gz: 3613b2feca5bd22ecb7ba4013475b63455867f8b3cd47d30a145099a42ee03e45fb344e5dbd7ba2647708f8a8fa799aac659c66b4d677a21f5a9d9e08d25f1c6

data/lib/ohai/vagrant.rb

@@ -1,34 +1,64 @@
 Ohai.plugin(:VboxIpaddress) do
 
+  def read_json(filename)
+    if defined? FFI_Yajl::Parser
+      FFI_Yajl::Parser.new.parse(IO.read(filename))
+    else
+      require 'json'
+      JSON.parse(IO.read(filename))
+    end
+  end
+
+  def lookup_address_by_nic(network, nic)
+    if network['interfaces'][nic]
+      network['interfaces'][nic]['addresses'].each do |ip, params|
+        if params['family'] == ('inet')
+          return [nic, ip]
+        end
+      end
+    end
+    return [nil, nil]
+  end
+
+  def lookup_address_by_ipaddress(network, ip)
+    nic = network['interfaces'].find do |nic, nic_info|
+      nic_info['addresses'].select {|addr, addr_info| addr_info['family'] == 'inet'}.keys.include?(ip)
+    end
+    if nic
+      return [nic, ip]
+    end
+    return [nil, nil]
+  end
+
   provides 'ipaddress'
 
   depends 'ipaddress'
+  depends 'network'
   depends 'network/interfaces'
   depends 'virtualization/system'
   depends 'etc/passwd'
 
+  collect_data(:default) do
   # Ohai hint
-  unless File.exist?('/etc/chef/ohai_plugins/vagrant.json')
-    Chef::Log.fail('Ohai has not set :ipaddress (Missing vagrant.json)')
-    return
-  end
-  vagrant = JSON.parse(IO.read('/etc/chef/ohai_plugins/vagrant.json'))
+    unless File.exist?('/etc/chef/ohai_plugins/vagrant.json')
+      Ohai::Log.fail('Ohai has not set :ipaddress (Missing vagrant.json)')
+    else
+      vagrant = read_json('/etc/chef/ohai_plugins/vagrant.json')
 
-  # requested nit
-  nic = vagrant['primary_nic']
-  if nic.nil?
-    Chef::Log.debug('nic not set for vagrant-ohai plugin. Skipping')
-    return
-  end
-
-  collect_data(:default) do
-    if etc['passwd'].any? { |k, _v| k == 'vagrant' }
-      if network['interfaces'][nic] && virtualization['system'] == 'vbox'
-        network['interfaces'][nic]['addresses'].each do |ip, params|
-          if params['family'] == ('inet')
-            ipaddress ip
-            Chef::Log.info("Ohai override :ipaddress to #{ip} from #{nic}")
-          end
+      # requested nit
+      nic = vagrant['primary_nic']
+      if etc['passwd'].keys.include?('vagrant') && virtualization['system'] == 'vbox'
+        if nic
+          nic, addr = lookup_address_by_nic(network, nic)
+        elsif vagrant['private_ipv4']
+          nic, addr = lookup_address_by_ipaddress(network, vagrant['private_ipv4'])
+        else
+          nic, addr = nil, nil
+          Ohai::Log.info("Neither nic nor private_ipv4 are set, skipping")
+        end
+        if addr
+          Ohai::Log.info("Ohai override :ipaddress to #{addr} from #{nic}")
+          ipaddress addr
         end
       end
     end

data/lib/vagrant-ohai/action_install_ohai_plugin.rb

@@ -44,6 +44,7 @@ module VagrantPlugins
         info = {}
         info[:box] = @machine.config.vm.box
         info[:primary_nic] = @machine.config.ohai.primary_nic
+        info[:private_ipv4] = private_ipv4
         info
       end
 

data/lib/vagrant-ohai/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ohai
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ohai
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Avishai Ish-Shalom