vagrant-ohai 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3932d09503b417f318d348c6e88413c5935a117
-  data.tar.gz: 64225a6638bf7d80efd1cd126f8e19e78d0450e1
+  metadata.gz: 73ce468107ce76701b2482582e1687926d540432
+  data.tar.gz: c2437560561622a680e3a376e85b858dcdf09940
 SHA512:
-  metadata.gz: 3e29c9e0abb9346e6cb31fd678b787575d4683f442de2f99bc6f3548782bac692bc499a1da07bf47021b9311661dafabf49b645d818bc737e422f5b99c5abbc3
-  data.tar.gz: 8fe4fe67f71fc709800cf2bd3177e932280c04e2e30912b423cfb716b8f1e29127d8da3135e6172df0f4c692c044cce9968a2b97728ea04e0784eb04aed7c628
+  metadata.gz: f1b1daf578e9b8949c6053d1bc2345c22010f7b84f6e9c4460d18a03c7d56326a908f7e25ebbe4fe42a2cf6410119c0d6650984d6e3d6c3f964d0e5ea42bdc63
+  data.tar.gz: aa6c7f51cf10555125d8cca6209b65a9ae5e3f21aaaef5bfc8f794bada351f180d6b9a5c5eae8176ad4dab06fcd3082bb136e82e02fec4bcc0daea0bdaa83672

data/README.md

@@ -7,18 +7,23 @@ In particular, the ipaddress is set to the private network defined in vagrant, i
 
     vagrant plugin install vagrant-ohai
 
-
 ## Usage
 
-The plugin will automatcially activate when using the `:chef_solo`, `:chef_zero`, `:chef_apply` or `:chef_client` provisioners. If you want to disable it, put `config.ohai.enable = false` in your Vagrantfile.
+The plugin will automatically activate when using the `:chef_solo`, `:chef_zero`, `:chef_apply`, `:chef_client` or `:shell` provisioners. If you want to disable it, put `config.ohai.enable = false` in your Vagrantfile.
 If you wish to use a primary nic which is not a private network, e.g. when using a bridge, set the `primary_nic` option:
 
     config.ohai.primary_nic = "eth1"
 
-## Compatability
+To activate custom plugin support put `config.ohai.plugins_dir = <full_path_to_plugins_dir>` in your Vagrantfile
+
+    config.ohai.plugins_dir = "/var/ohai/custom_plugins"
+
+## Compatibility
 
 This plugin works with Vagrant 1.2.3 and above.
 
+It has only been tested on VirtualBox but should also work with other Vagrant providers.
+
 ## Contributing
 
 1. Fork it

data/lib/ohai/vagrant.rb

@@ -47,19 +47,17 @@ Ohai.plugin(:VboxIpaddress) do
 
       # 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
+      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_configure_chef.rb

@@ -26,7 +26,7 @@ module VagrantPlugins
       end
 
       def register_custom_chef_config
-        return unless @machine.config.ohai.enable
+        return unless @machine.config.ohai.enable or @machine.config.ohai.plugins_dir
         chef_provisioners.each do |provisioner|
           if provisioner.config.respond_to? :custom_config_path and not provisioner.config.custom_config_path == Plugin::UNSET_VALUE
             current_custom_config_path = provisioner.config.custom_config_path

data/lib/vagrant-ohai/action_install_ohai_plugin.rb

@@ -23,6 +23,11 @@ module VagrantPlugins
           create_ohai_folders
           copy_ohai_plugin
         end
+        if is_chef_used && @machine.config.ohai.plugins_dir
+          @machine.ui.info("Installing Custom Ohai plugin")
+          create_ohai_folders
+          copy_ohai_custom_plugins
+        end
       end
 
       private
@@ -58,6 +63,15 @@ module VagrantPlugins
         @machine.communicate.upload(OHAI_PLUGIN_PATH, "/etc/chef/ohai_plugins/vagrant.rb")
       end
 
+      def copy_ohai_custom_plugins
+
+        files = Dir.entries(@machine.config.ohai.plugins_dir).select { |e| e =~ /^[a-z]+\.rb/ }
+        files.each do |file|
+          custom_ohai_plugin_path = File.expand_path("#{@machine.config.ohai.plugins_dir}/#{file}", __FILE__)
+          @machine.communicate.upload(custom_ohai_plugin_path, "/etc/chef/ohai_plugins/#{file}")
+        end
+      end
+
     end
   end
 end

data/lib/vagrant-ohai/config.rb

@@ -3,14 +3,17 @@ module VagrantPlugins
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :enable
       attr_accessor :primary_nic
+      attr_accessor :plugins_dir
 
       def initialize
         @enable = UNSET_VALUE
         @primary_nic = UNSET_VALUE
+        @plugins_dir = UNSET_VALUE
       end
       def finalize!
         @enable = true if @enable == UNSET_VALUE
         @primary_nic = nil if @primary_nic == UNSET_VALUE
+        @plugins_dir = nil if @plugins_dir == UNSET_VALUE
       end
 
       def validate(machine)
@@ -28,6 +31,16 @@ module VagrantPlugins
         else
           {"enable" => ["enable must be true or false"] }
         end
+        case @plugins_dir
+        when nil
+          {}
+        else
+          if !File.directory?(@plugins_dir.to_s) or @plugins_dir.to_s !~ /^\//
+            {"plugins_dir" => ["plugins_dir must be an absolute path to a folder"]}
+          else
+            {}
+          end
+        end
       end
 
     end

data/lib/vagrant-ohai/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ohai
-    VERSION = "0.1.12"
+    VERSION = "0.1.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ohai
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Avishai Ish-Shalom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler