vagrant-vmware-dhcp 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b94ee9258152c1f4876cd69480f2f5aaf86d34
-  data.tar.gz: 9ca0e66e7f97bb066277bad8dccda536c8f2bf07
+  metadata.gz: e79948a505c5fd7198d8a4e30c31a85acfceea88
+  data.tar.gz: 1e7815abe6fd14a1a535fe7d415cb341fc87592e
 SHA512:
-  metadata.gz: 669af463443c20509ea29e71cf05e1e904815e5fea53965da20741598754099188283c27d639723202f8a3500cd851be974002772dee726456bcedd508466c59
-  data.tar.gz: c581d528b41c80c62f9523b3f3fe850abf62d700bbbe52a26062adad0a0ffce1e51945f45d75565f078fa61b68ffd55eb7f35f45a8c3f668d06b2045011cc92f
+  metadata.gz: 153746f190ba6ad0fb1a71e6310f230407f8fb82f48f66fa0e4ba0c1ad8555ec89025b34e46ecdc2992cb8dd91382723bb906a953898d61103c70a7ba8e9b654
+  data.tar.gz: 4e9b895b4eb3a02f56d0d7efd5f2f8ab5c45dc139c2b05fea877bc55171fdd41edf28d758db886d22bf86ecdae6a528d243b91368538c4f30bbb97f6f0dbdec9

data/lib/vagrant-vmware-dhcp/action/config_dhcp.rb

@@ -16,9 +16,7 @@ module VagrantPlugins
           @env = env
 
           if @env[:machine]
-            @logger.debug("In config_dhcp provider_name is #{@env[:machine].provider_name}")
-
-            if (@env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation) and @env[:machine].config.control_dhcp
+            if @env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation
               configure_dhcp
             end
           end
@@ -105,10 +103,14 @@ module VagrantPlugins
           network_map.each {
             |mac, network|
 
-            @env[:ui].info("Configuring DHCP for #{network[:ip]} on #{network[:vnet]}")
-
+            @logger.info("Pruning DHCP configuration for #{network[:ip]}")
             prune_dhcpd_conf(network)
-            write_dhcpd_conf(network)
+
+            if machine.config.control_dhcp == true
+              @env[:ui].info("Configuring DHCP for #{network[:ip]} on #{network[:vnet]}")
+
+              write_dhcpd_conf(network)
+            end
           }
 
           trigger_dhcpd_update

data/lib/vagrant-vmware-dhcp/action/config_dhcp_darwin.rb

@@ -25,6 +25,9 @@ module VagrantPlugins
 
           mac = network[:mac]
 
+          before = File.open(conf_location).read
+          @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
           command = []
           command << "sudo" if !File.writable?(conf_location)
           command += [
@@ -36,6 +39,9 @@ module VagrantPlugins
           ]
 
           system(*command)
+
+          after = File.open(conf_location).read
+          @logger.debug("After, dhcpd.conf content is #{after}")
         end
 
         def write_dhcpd_conf(network)

data/lib/vagrant-vmware-dhcp/action/config_dhcp_linux.rb

@@ -25,6 +25,9 @@ module VagrantPlugins
 
           mac = network[:mac]
 
+          before = File.open(conf_location).read
+          @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
           command = []
           command << "sudo" if !File.writable?(conf_location)
           command += [
@@ -36,6 +39,9 @@ module VagrantPlugins
           ]
 
           system(*command)
+
+          after = File.open(conf_location).read
+          @logger.debug("After, dhcpd.conf content is #{after}")
         end
 
         def write_dhcpd_conf(network)

data/lib/vagrant-vmware-dhcp/action/config_dhcp_windows.rb

@@ -29,7 +29,6 @@ module VagrantPlugins
           mac = network[:mac]
 
           before = File.open(conf_location).read
-
           @logger.debug("Before altering, dhcpd.conf content is #{before}")
 
           after = before.gsub(/^# VAGRANT-BEGIN: #{mac}.*^# VAGRANT-END: #{mac}\s+/m, '')

data/lib/vagrant-vmware-dhcp/action/set_mac.rb

@@ -15,9 +15,7 @@ module VagrantPlugins
           @env = env
 
           if @env[:machine]
-            machine = @env[:machine]
-
-            if (@env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation) and @env[:machine].config.control_dhcp
+            if (@env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation)
               set_mac_address(@env)
             end
           end
@@ -39,7 +37,9 @@ module VagrantPlugins
 
         def mac_from_ip(ip)
           sha = Digest::SHA256.hexdigest ip
-          mac = sha.scan(/.{12}/)[0]
+
+          # VMWare doesn't like odd values for the first octet.
+          mac = "AA" + sha.scan(/.{10}/)[0]
 
           mac
         end

data/lib/vagrant-vmware-dhcp/plugin.rb

@@ -19,12 +19,14 @@ module VagrantPlugins
       end
 
       action_hook('DA VMWare Network: Configure dhcp.conf') do |hook|
-        if Vagrant::Util::Platform.windows?
+        if defined?(ActionClass) and defined?(ConfigDhcpClass)
+          # no-op
+        elsif Vagrant::Util::Platform.windows?
           ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpWindows
-          ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+          ActionClass = HashiCorp::VagrantVMwareworkstation::Action::Network
         elsif Vagrant::Util::Platform.linux?
           ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpLinux
-          ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+          ActionClass = HashiCorp::VagrantVMwareworkstation::Action::Network
         elsif Vagrant::Util::Platform.darwin?
           ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpDarwin
           ActionClass = HashiCorp::VagrantVMwarefusion::Action::Network

data/lib/vagrant-vmware-dhcp/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantVmwareDhcp
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Israel Shirk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake