vagrant-ohai 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjdmMDhkNjEwYmU2Yzg5ODM5ZGEzYWI1Y2Y2NDM5ZWM3ZDkzNWEzOA==
-  data.tar.gz: !binary |-
-    MmUwNDIwN2EwNDQ5ZDJjZWVmYmI3MDdmNTE3OGU2YzEwYWVlOWNlYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzYxZjU0ZGFlMjdiMGUxNGUzZTE3MGIxOGRiYWRkNDMxM2E1NjMzMzk1YmE4
-    ZWE1NTA1MGQ4NGFlY2UxNmE2NDQwZDNjOTcwZWI0YThhZDNlMTI4YTIzYzEx
-    ZDU3NmY3YTBmNTVkYzE5MDAyNmQ2OGJhOGYwNzg5NDNiYjUyNDU=
-  data.tar.gz: !binary |-
-    NDZjYTFkYTVlZDlmZDFhY2I0OTlkZTRkYTQ1OWM1YmMyZDgxYThjMWVjYmE1
-    OGZlYjg1NzVkZDEyYmM4OGQ2YjQxNGZiYjgxMDExOWJkMWYzZTAwM2I0YjA3
-    MTIyNzdmYzFiZjZjOGNmNzJlZjRkOWUzZmE1Mjc3M2M2YTU4NmI=
+SHA1:
+  metadata.gz: 467ca797e2547af64cd69480e69b09b405f1f5a9
+  data.tar.gz: 4b1b7eb2e238de17be072f7a3d14e9e6c0b16783
+SHA512:
+  metadata.gz: 09f6532b1220a561e0efd968a1e19b569f25db6ada53a959a3f1cb38e8c785a05b69c533d60093e81ec5a85afdf52fe164bb5e722acf4003fd9a04c923f6471d
+  data.tar.gz: 914ab895dd5d5771e2d92424d08649eec8b27552b2ccb69edb3a6fd8c7faec758496d51ca96f4435cf71aca42a6867211d11501bb8046e51696c21ca55520052

data/lib/ohai/vagrant.rb

@@ -1,19 +1,36 @@
-hints = hint?("vagrant")
+Ohai.plugin(:VboxIpaddress) do
 
-provides "vagrant"
-provides "cloud"
+  provides 'ipaddress'
 
-vagrant Mash.new
-cloud Mash.new
+  depends 'ipaddress'
+  depends 'network/interfaces'
+  depends 'virtualization/system'
+  depends 'etc/passwd'
 
-if hints
-  vagrant.merge!(hints)
-  require_plugin "cloud"
-  if vagrant[:primary_nic]
-    ipaddress network[:interfaces][vagrant[:primary_nic]][:addresses].find{|addr, addr_opts| addr_opts[:family] == "inet"}.first
-  elsif vagrant[:private_ipv4]
-    cloud[:local_ipv4] = vagrant[:private_ipv4]
-    ipaddress vagrant[:private_ipv4]
+  # 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'))
+
+  # 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
+        end
+      end
+    end
   end
-  cloud[:provider] = "vagrant"
 end

data/lib/vagrant-ohai/action_install_ohai_plugin.rb

@@ -14,23 +14,23 @@ module VagrantPlugins
       end
 
       def call(env)
+        is_chef_used = chef_provisioners.any?
         @app.call(env)
         return unless @machine.communicate.ready?
 
-        if chef_provisioners.any? and @machine.config.ohai.enable
+        if is_chef_used && @machine.config.ohai.enable
           @machine.ui.info("Installing Ohai plugin")
           create_ohai_folders
           copy_ohai_plugin
-          hint_ohai
         end
       end
 
       private
+
       def create_ohai_folders
         @machine.communicate.tap do |comm|
-          comm.sudo("mkdir -p /etc/chef/ohai/hints")
           comm.sudo("mkdir -p /etc/chef/ohai_plugins")
-          comm.sudo("chown -R #{@machine.ssh_info[:username]} /etc/chef/ohai/hints /etc/chef/ohai_plugins")
+          comm.sudo("chown -R #{@machine.ssh_info[:username]} /etc/chef/ohai_plugins")
         end
       end
 
@@ -42,20 +42,18 @@ module VagrantPlugins
 
       def vagrant_info
         info = {}
-        info[:private_ipv4] = private_ipv4 if private_ipv4
         info[:box] = @machine.config.vm.box
         info[:primary_nic] = @machine.config.ohai.primary_nic
         info
       end
 
-      def hint_ohai
+      def copy_ohai_plugin
+
         hint_file = Tempfile.new(["vagrant-ohai", ".json"])
         hint_file.write(vagrant_info.to_json)
         hint_file.close
-        @machine.communicate.upload(hint_file.path, "/etc/chef/ohai/hints/vagrant.json")
-      end
+        @machine.communicate.upload(hint_file.path, "/etc/chef/ohai_plugins/vagrant.json")
 
-      def copy_ohai_plugin
         @machine.communicate.upload(OHAI_PLUGIN_PATH, "/etc/chef/ohai_plugins/vagrant.rb")
       end
 

data/lib/vagrant-ohai/helpers.rb

@@ -1,12 +1,12 @@
 module VagrantPlugins
   module Ohai
+    #
     module Helpers
-
       def chef_provisioners
-        @machine.config.vm.provisioners.find_all {|provisioner|
-            [:chef_client, :chef_solo].include? provisioner.name }
+        @machine.config.vm.provisioners.find_all do |provisioner|
+          [:shell, :chef_client, :chef_solo, :chef_zero, :chef_apply].include? provisioner.type
+        end
       end
-
     end
   end
 end

data/lib/vagrant-ohai/vagrant-ohai.rb

@@ -4,7 +4,7 @@ require "vagrant/plugin"
 raise RuntimeError, "vagrant-ohai will only work with Vagrant 1.2.3 and above!" if Vagrant::VERSION <= "1.2.3"
 
 module VagrantPlugins
-  module Ohai 
+  module Ohai
     class Plugin < Vagrant.plugin("2")
       name "vagrant-ohai"
       description <<-DESC
@@ -12,16 +12,13 @@ module VagrantPlugins
       correspond to Vagrant's private network
       DESC
 
-      hook_block = proc do |hook|
+      action_hook(:install_ohai_plugin, Plugin::ALL_ACTIONS) do |hook|
         require_relative 'action_install_ohai_plugin'
         require_relative 'action_configure_chef'
         hook.after(Vagrant::Action::Builtin::Provision, ActionInstallOhaiPlugin)
         hook.before(Vagrant::Action::Builtin::ConfigValidate, ActionConfigureChef)
       end
 
-      action_hook(:install_ohai_plugin, :machine_action_provision, &hook_block) 
-      action_hook(:install_ohai_plugin, :machine_action_up, &hook_block) 
-
       config(:ohai) do
         require_relative "config"
         Config

data/lib/vagrant-ohai/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ohai
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ohai
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Avishai Ish-Shalom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant plugin which installs an Ohai plugn to properly detect private
@@ -46,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,17 +71,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin which installs an Ohai plugn to properly detect private ipaddress