vagrant-vmware-esxi 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c209baac764ee4612a55315a878c1f30d26ed331
-  data.tar.gz: 7731bdc92a7bff3baf284c36717a01fe70c1195b
+  metadata.gz: '0269af4374c1d658023f26ddfae4e1a053ca787c'
+  data.tar.gz: 4781afa7b1c5e2aca3266435da76fb36f7d39488
 SHA512:
-  metadata.gz: f98c2cb77a3a6d3343b244e1dad828ef97849d97917718ce9c56918238b0a0a4fd9f81ec3f1401bcb539a92f0e792b880b0679ac40c8b460179b68e11ec85685
-  data.tar.gz: d3f67cd7ad02ea533080fb2267324af6e018ff858437f6d5ff1516e13705ee2522587b21ddbd43ba2f735356d56935701144f26108f69590122ab6d748037181
+  metadata.gz: f6a21947c2f23be0a15109090112cd84d22c6ae18b8a2e3334fba8e659947acfcb13c5dd582da3c09f33bde4d2e668e63778b1589bd21abaf1081a1159ca936e
+  data.tar.gz: 0b701c40c221893d32381197c51d7b2d8a8fd32075dc3ecee13350304db64446407fb0364a29e1384accf53d93ecfebbc41cbf8eb4b5c6ce68b18cbcda0cbf57

data/README.md

@@ -23,11 +23,12 @@ Features and Compatibility
 
 Requirements
 ------------
-1. This plugin requires ovftool from VMware.  Download from VMware website.
+1. This is a vagrant plugin, so you need vagrant installed...  :-)
+2. This plugin requires ovftool from VMware.  Download from VMware website.
 >https://www.vmware.com/support/developer/ovf/
-2. You MUST enable ssh access on your ESXi hypervisor.
+3. You MUST enable ssh access on your ESXi hypervisor.
   * Google 'How to enable ssh access on esxi'
-3. The boxes must have open-vm-tools or vmware-tools installed to properly transition to the "running" state.
+4. The boxes must have open-vm-tools or vmware-tools installed to properly transition to the "running" state.
 
 Why this plugin?
 ----------------
@@ -114,7 +115,11 @@ Vagrant.configure("2") do |config|
     #  HIGHLY RECOMMENDED!  Virtual Network
     #    You should specify a Virtual Network!
     #    The default is to use the first found!
-    esxi.virtual_network = "vmnet_example"
+    #    You can specify up to 4 virtual networks using an array
+    #    format.  Note that Vagrant only looks at the first 
+    #    interface for an IP address.
+    #esxi.virtual_network = "vmnet_example"
+    #esxi.virtual_network = ["vmnet1","vmnet2","vmnet3","vmnet4"]
 
     #  OPTIONAL.  Specify a Disk Store
     #    The Default is to use the least used Disk Store.
@@ -123,7 +128,8 @@ Vagrant.configure("2") do |config|
     #  OPTIONAL.  Guest VM name to be created/used.
     #    The Default will be automatically generated
     #    and will be based on the vmname_prefix,
-    #    hostname, username, path...
+    #    hostname, username, path.  Otherwise you
+    #    can set a fixed guest VM name here.
     #esxi.vmname = "Custom-Guest-VM_Name"
 
     #  OPTIONAL.  When automatically naming VMs, use
@@ -144,8 +150,9 @@ Vagrant.configure("2") do |config|
     #    The default is to create VMs in the "root".  You can
     #     specify a resource pool here to partition memory and
     #     cpu usage away from other systems on your esxi host.
-    #     The resource pool must already exist and be configured.
-    #     Vagrant will NOT create it for you.
+    #     The resource pool must already exist and have the
+    #     proper permissions set.
+    #     Vagrant will NOT create a Resource pool it for you.
     #esxi.resource_pool = "/Vagrant"
 
     #  DANGEROUS!  Allow Overwrite
@@ -185,3 +192,9 @@ Known issues with vmware_esxi
   * In general I find NFS synced folders pretty "flakey" anyways...
 * Multi machines may not provision one VM if the boxes are different.
   * I found this problem with libvirt also, so I'm assuming it's a vagrant problem...
+
+
+Feedback please!
+----------------
+* To help improve this plugin, I'm requesting that you provide some feedback.
+* https://goo.gl/forms/tY14mE77HJvhNvjj1

data/example_box/Vagrantfile

@@ -67,7 +67,9 @@ Vagrant.configure("2") do |config|
     #  HIGHLY RECOMMENDED!  Virtual Network
     #    You should specify a Virtual Network!
     #    The default is to use the first found!
-    esxi.virtual_network = "vmnet_example"
+    #    You can specify up to 4 virtual networks using an array format.
+    #esxi.virtual_network = "vmnet_example"
+    #esxi.virtual_network = ["vmnet1","vmnet2","vmnet3","vmnet4"]
 
     #  OPTIONAL.  Specify a Disk Store
     #    The Default is to use the least used Disk Store.

data/example_box/Vagrantfile-multimachine

@@ -25,7 +25,7 @@ Vagrant.configure("2") do |config|
     esxi.esxi_password = nil
     #esxi.esxi_private_keys = []
     #esxi.esxi_hostport = 22
-    esxi.virtual_network = "vmnet_example"
+    #esxi.virtual_network = "vmnet_example"
     #esxi.vm_disk_store = "DS_001"
     #esxi.vmname_prefix = "V-"
     #esxi.memsize = "2048"

data/lib/vagrant-vmware-esxi/action/createvm.rb

@@ -131,25 +131,30 @@ module VagrantPlugins
                              "#{r.stderr}"
             end
 
+            guestvm_network = []
+            counter = 0
             if config.virtual_network.nil?
-              guestvm_network = availnetworks.first
-            elsif availnetworks.include? config.virtual_network
-              guestvm_network = config.virtual_network
+              guestvm_network[0] = availnetworks.first
+              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                    message: 'WARNING         : '\
+                                             "config.virtual_network not "\
+                                             "set, using #{availnetworks.first}")
             else
-              guestvm_network = availnetworks.first
-            end
-
-            if guestvm_network != config.virtual_network
-              if config.virtual_network.nil?
-                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                     message: 'WARNING         : '\
-                                              "config.virtual_network not "\
-                                              "set, using #{availnetworks.first}")
-              else
-                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                     message: 'WARNING         : '\
-                                              "#{config.virtual_network} not "\
-                                              "found, using #{availnetworks.first}")
+              networkID = 0
+              for aVirtNet in Array(config.virtual_network) do
+                if availnetworks.include? aVirtNet
+                  guestvm_network << aVirtNet
+                else
+                  guestvm_network << availnetworks.first
+                  env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                       message: 'WARNING         : '\
+                                                "#{aVirtNet} not "\
+                                                "found, using #{availnetworks.first}")
+                end
+                networkID += 1
+                if networkID >= 4
+                  break
+                end
               end
             end
 
@@ -176,14 +181,12 @@ module VagrantPlugins
                 new_vmx_contents << "memsize = \"#{desired_memsize}\"\n"
               elsif line.match(/^numvcpus =/i) && (!desired_numvcpus.nil?)
                 new_vmx_contents << "numvcpus = \"#{desired_numvcpus}\"\n"
-              elsif line.match(/^ethernet0.networkName =/i)
-                new_vmx_contents << "ethernet0.networkName = \"#{guestvm_network}\"\n"
-              elsif line.match(/^ethernet0.addressType =.*static/i)
-                new_vmx_contents << 'ethernet0.addressType = \"generated\"'
-              elsif line.match(/^ethernet[1-9]/i) ||
-                    line.match(/^ethernet0.address = /i) ||
-                    line.match(/^ethernet0.generatedAddress = /i) ||
-                    line.match(/^ethernet0.generatedAddressOffset = /i)
+              elsif line.match(/^ethernet[0-9].networkName =/i) ||
+                    line.match(/^ethernet[0-9].addressType =/i) ||
+                    line.match(/^ethernet[0-9].present =/i) ||
+                    line.match(/^ethernet[0-9].address =/i) ||
+                    line.match(/^ethernet[0-9].generatedAddress =/i) ||
+                    line.match(/^ethernet[0-9].generatedAddressOffset =/i)
                 # Do nothing, delete these lines
               else
                 new_vmx_contents << line
@@ -199,8 +202,24 @@ module VagrantPlugins
               end
             end
 
-            unless new_vmx_contents =~ %r{^ethernet0.networkName =}i
-              new_vmx_contents << "ethernet0.networkName = \"#{guestvm_network}\"\n"
+            #unless new_vmx_contents =~ %r{^ethernet0.networkName =}i
+            #  new_vmx_contents << "ethernet0.networkName = \"#{guestvm_network}\"\n"
+            #end
+            netOpts = ""
+            networkID = 0
+            for element in guestvm_network do
+              if (config.debug =~ %r{true}i) ||
+                 (config.debug =~ %r{yes}i)
+                puts "guestvm_network[#{networkID}]: #{element}"
+              end
+              new_vmx_contents << "ethernet#{networkID}.networkName = \"net#{networkID}\"\n"
+              new_vmx_contents << "ethernet#{networkID}.present = \"TRUE\"\n"
+              new_vmx_contents << "ethernet#{networkID}.addressType = \"generated\"\n"
+              netOpts << " --net:\"net#{networkID}=#{element}\""
+              networkID += 1
+              if networkID >= 4
+                break
+              end
             end
 
             if config.custom_vmx_settings.is_a? Array
@@ -260,7 +279,7 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "Disk Store      : #{guestvm_dsname}")
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                 message: "NetworkName     : \"#{guestvm_network}\"")
+                                 message: "NetworkName     : #{guestvm_network[0..3]}")
             unless overwrite_opts.nil?
               env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                    message: 'Allow Overwrite : True')
@@ -277,7 +296,7 @@ module VagrantPlugins
                              '  install from http://www.vmware.com.'
             end
             ovf_cmd = "ovftool --noSSLVerify #{overwrite_opts} "\
-                  "-nw=\"#{guestvm_network}\" -dm=thin --powerOn "\
+                  "#{netOpts} -dm=thin --powerOn "\
                   "-ds=\"#{guestvm_dsname}\" --name=\"#{guestvm_vmname}\" "\
                   "\"#{new_vmx_file}\" vi://#{config.esxi_username}:"\
                   "#{config.esxi_password}@#{config.esxi_hostname}"\

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

@@ -1,6 +1,6 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '1.1.7'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Jonathan Senkerik