vagrant-ohai 0.1.4 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODhlMGZhZjAwMGMxNjQ2OWI5ZGNlZmIwYWYzZTU3MzM3NWVlOGJjMw==
+    ZjdmMDhkNjEwYmU2Yzg5ODM5ZGEzYWI1Y2Y2NDM5ZWM3ZDkzNWEzOA==
   data.tar.gz: !binary |-
-    ZGYwNDIxYTFiMGM3NDlkNzlhOWQ5NzE1YTk5MmZlZjY5ZTI0YThhMA==
+    MmUwNDIwN2EwNDQ5ZDJjZWVmYmI3MDdmNTE3OGU2YzEwYWVlOWNlYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzZlYzdiMmZkODA3NTFiYTU5YjM0ODk4MDdlOGNiM2E4NDgyYWE5ZGEzNGJk
-    ZDE2ZjM1YzcwMzc3NjdmOGQ0NmFiOTQ0YjFlZDg0MTAxMzkzMGY0ZTcwZWYy
-    YjhjNThiNWZjOGFkMmZiNDg5ZTU5ZTkzODQyZWJhZWM5MjFmODQ=
+    NzYxZjU0ZGFlMjdiMGUxNGUzZTE3MGIxOGRiYWRkNDMxM2E1NjMzMzk1YmE4
+    ZWE1NTA1MGQ4NGFlY2UxNmE2NDQwZDNjOTcwZWI0YThhZDNlMTI4YTIzYzEx
+    ZDU3NmY3YTBmNTVkYzE5MDAyNmQ2OGJhOGYwNzg5NDNiYjUyNDU=
   data.tar.gz: !binary |-
-    NTQ2ZjEzY2I1OTNjZjM5OTUzZTYyNmZjZWUzM2RiZTQ4ZWI2ZWZiMDI0YTk5
-    ODBlY2Y2NTAzZDExNDBjZGRhYTFlYTVlODRlNGJjZDBjN2Y2NmU0Mzg3NzEy
-    YjQxZGQwMTcwMGMxZTJjNWI0MDFkMThmN2ViMTA1NTAyYWFmNzE=
+    NDZjYTFkYTVlZDlmZDFhY2I0OTlkZTRkYTQ1OWM1YmMyZDgxYThjMWVjYmE1
+    OGZlYjg1NzVkZDEyYmM4OGQ2YjQxNGZiYjgxMDExOWJkMWYzZTAwM2I0YjA3
+    MTIyNzdmYzFiZjZjOGNmNzJlZjRkOWUzZmE1Mjc3M2M2YTU4NmI=

data/README.md

@@ -11,6 +11,9 @@ In particular, the ipaddress is set to the private network defined in vagrant, i
 ## Usage
 
 The plugin will automatcially activate when using the `:chef_solo` or `:chef_client` 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
 

data/lib/ohai/vagrant.rb

@@ -3,13 +3,15 @@ hints = hint?("vagrant")
 provides "vagrant"
 provides "cloud"
 
-vagrant Mash.new 
+vagrant Mash.new
 cloud Mash.new
 
 if hints
   vagrant.merge!(hints)
   require_plugin "cloud"
-  if vagrant.has_key? :private_ipv4
+  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]
   end

data/lib/vagrant-ohai/action_install_ohai_plugin.rb

@@ -44,6 +44,7 @@ module VagrantPlugins
         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
 

data/lib/vagrant-ohai/config.rb

@@ -2,15 +2,26 @@ module VagrantPlugins
   module Ohai
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :enable
+      attr_accessor :primary_nic
 
       def initialize
         @enable = UNSET_VALUE
+        @primary_nic = UNSET_VALUE
       end
       def finalize!
         @enable = true if @enable == UNSET_VALUE
+        @primary_nic = nil if @primary_nic == UNSET_VALUE
       end
 
       def validate(machine)
+        case @primary_nic
+        when /eth[0-9]+/
+            {}
+        when nil
+            {}
+        else
+            {"primary_nic" => ["primary_nic must match eth[0-9]+"]}
+        end
         case @enable
         when TrueClass, FalseClass
           {}

data/lib/vagrant-ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ohai
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Avishai Ish-Shalom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler