vagrant-vmware-esxi 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '097f1326323d37d401b5243a7bc5287f8310ba62'
-  data.tar.gz: 8790e1347a0576d9f5f14deb698dc91de89f576e
+  metadata.gz: c220b80d1a181ae3dbe1ba7364a28813ef287021
+  data.tar.gz: 1372acaada64754b4ce0f69579ebb86cff807934
 SHA512:
-  metadata.gz: 7651298f91f3cbc1c301b416ef7ea88f9f40d23f7fd8ad23b65304fbff3978f6d3b8c97406f6cfef5c9182f525512f2f93f67c632ed04b6187cd71ae5d1e8a5a
-  data.tar.gz: 07bc3b59e29a6cf450be897ff1e1468cfdcc64edcba5ed3a8d77aa94bbd4d8d1bacf41bfa007cb00a938330914ccf00c96d58dd6b6fef33879080a00e32f540c
+  metadata.gz: aa6a785b4292394dc0df368d42c7134666b7f546811c8c1fbd35d9bfd7d7ab679f1cce0d762975589f218fdf98e11ee22dd2346dc87115628aac7a91de7e2a04
+  data.tar.gz: 549ee440d9442a31363ae3ce87e33be7d164c857b6bdeae07627ef8935a6f05a40a9e695fa24c61f376e6f629684bba14ab9baeb00bd8633ec4716788bd9189e

data/README.md

@@ -8,7 +8,7 @@ Features and Compatibility
 --------------------------
 * Any of the vmware Box formats should be compatible.
   * vmware_desktop, vmware_fusion, vmware_workstation...
-  * To be fully functional, you must have open-vm-tools or vmware tools installed
+  * To be fully functional, you must have open-vm-tools or vmware tools installed.
 * Will automatically download boxes from the web.
 * Will automatically upload the box to your ESXi host.
 * Automatic or manual VM names.
@@ -20,8 +20,10 @@ Features and Compatibility
 * rsync & NFS using built-in Vagrant synced folders.
 * Provision using built-in Vagrant provisioner.
 * package your vm's into boxes.
-* Set MAC addresses on network interfaces.
+* Create additional network interfaces, set nic type, MAC addresses, static IPs.
 * Use Vagrants Set IP addresses on network interfaces feature. (private_network, public_network)
+* Disks provisioned using thin, thick or eagerzeroedthick.
+* Specify GuestOS types, virtual HW version, or any custom vmx settings.
 
 Requirements
 ------------
@@ -149,13 +151,6 @@ Vagrant.configure("2") do |config|
     #  IMPORTANT!  Set the ESXi password or authentication method..
     esxi.esxi_password = "prompt:"
 
-    #  ESXi ssh keys.   (This is depreciated!!!)
-    #    The Default is to use system default ssh keys, However
-    #    you can specify an array of keys here...
-    #
-    #   ***  Depreciated, use esxi_password = "key:" instead. ***
-    #esxi.esxi_private_keys = []
-
     #  SSH port.
     #    Default port 22.
     #esxi.esxi_hostport = 22
@@ -196,6 +191,11 @@ Vagrant.configure("2") do |config|
     #    If it's not specified, the Default is to use the least used Disk Store.
     #esxi.vm_disk_store = "DS_001"
 
+    #  OPTIONAL. Specify a disk type.
+    #    If unspecified, it will be set to "thin", Otherwise, you can set to:
+    #    'thin', 'thick', or 'eagerzeroedthick'
+    #esxo.vm_disk_type = "thick"
+
     #  OPTIONAL.  Guest VM name to use.
     #    The Default will be automatically generated.  It will be based on
     #    the vmname_prefix (see below), your hostname & username and path.
@@ -225,6 +225,36 @@ Vagrant.configure("2") do |config|
     #     Vagrant will NOT create a Resource pool it for you.
     #esxi.resource_pool = "/Vagrant"
 
+    #  RISKY. guestos
+    #    if unspecified, the default will be generated by the OVFTool.  Most
+    #    of the time, you don't need to change this unless ovftool doesn't get
+    #    the correct information from the box.  See my page on supported guestos
+    #    types for ESXI.
+    #    https://github.com/josenk/vagrant-vmware-esxi/ESXi_guestos_types.md
+    #esxi.guestos = "centos7-64"
+
+    #  OPTIONAL. virtualhw_version
+    #    If unspecified, the default will be generated by the OVFTool.  Most
+    #    of the time, you don't need to change this unless you are using advanced
+    #    custom vmx settings that require it.
+    #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12 & 13.
+    #esxi.virtualhw_version = '11'
+
+    #  RISKY. custom_vmx_settings
+    #    You can specify an array of custom vmx settings to add (or to override
+    #    existing settings).   ****  I don't do any validation, so if you
+    #    make any errors, it will not be caught ***   This is the place you would
+    #    add any special settings you need in your vmx.  (Like adding a USB, DVD
+    #    CPU settings, etc...).
+    #    ex vhv.enable = 'TRUE' will be appended, floppy0.presend = 'TRUE' will be modified
+    #esxi.custom_vmx_settings = [['vhv.enable','TRUE'], ['floppy0.present','TRUE']]
+
+    #  OPTIONAL. lax
+    #    If unspecified, the ovftool option --lax is disabled.   If you are
+    #    importing ovf boxes that generate errors, you may want to enable lax
+    #    to convert the errors to warning. (then the import could succeed)
+    #esxi.lax = 'true'
+
     #  DANGEROUS!  Allow Overwrite
     #    If unspecified, the default is to produce an error if overwriting
     #    vm's and packages.
@@ -259,7 +289,7 @@ Basic usage
 Known issues with vmware_esxi
 -----------------------------
 * The boxes must have open-vm-tools or vmware-tools installed to properly transition to the "running" state.
-* Invalid settings (bad IP address, netmask, MAC address) could cause 'vagrant up' to fail.  Review your ESXi logs to help debug why it failed.
+* Invalid settings (bad IP address, netmask, MAC address, custom_vmx_settings) could cause 'vagrant up' to fail.  Review your ESXi logs to help debug why it failed.
 * Cleanup doesn't always destroy a VM that has been partially built.  Use the allow_overwrite = 'True' option if you need to force a rebuild, or delete the vm using the VSphere client.
 * ovftool installer for windows doesn't put ovftool.exe in your path.  You can manually set your path, or install ovftool in the \HashiCorp\Vagrant\bin directory.
 * In general I find NFS synced folders a little "flaky"...
@@ -267,6 +297,13 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 1.5.0 Add support for:
+          Specify custom_vmx_settings (to add or modify vmx settings).
+          Specify Virtual HW version.
+          Allow $ in Password.
+          Disk types (thick, thin, eagerzeroedthick).
+          Specify a guestOS type (see list above).
+          Relaxed ovftool setting (--lax), to allow importing strange ovf boxes.
 * 1.4.0 Add support to set MAC and IP addresses for network interfaces.
 * 1.3.2 Fix, Don't timeout ssh connection when ovftool takes a long time to upload image.
 * 1.3.0 Add support to get esxi password from env, from a file or prompt.

data/example_box/Vagrantfile

@@ -95,13 +95,6 @@ Vagrant.configure("2") do |config|
     #  IMPORTANT!  Set the ESXi password or authentication method..
     esxi.esxi_password = "prompt:"
 
-    #  ESXi ssh keys.   (This is depreciated!!!)
-    #    The Default is to use system default ssh keys, However
-    #    you can specify an array of keys here...
-    #
-    #   ***  Depreciated, use esxi_password = "key:" instead. ***
-    #esxi.esxi_private_keys = []
-
     #  SSH port.
     #    Default port 22.
     #esxi.esxi_hostport = 22
@@ -171,6 +164,36 @@ Vagrant.configure("2") do |config|
     #     Vagrant will NOT create a Resource pool it for you.
     #esxi.resource_pool = "/Vagrant"
 
+    #  RISKY. guestos
+    #    if unspecified, the default will be generated by the OVFTool.  Most
+    #    of the time, you don't need to change this unless ovftool doesn't get
+    #    the correct information from the box.  See my page on supported guestos
+    #    types for ESXI.
+    #    https://github.com/josenk/vagrant-vmware-esxi/ESXi_guestos_types.md
+    #esxi.guestos = "centos7-64"
+
+    #  OPTIONAL. virtualhw_version
+    #    If unspecified, the default will be generated by the OVFTool.  Most
+    #    of the time, you don't need to change this unless you are using advanced
+    #    custom vmx settings that require it.
+    #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12 & 13.
+    #esxi.virtualhw_version = '11'
+
+    #  RISKY. custom_vmx_settings
+    #    You can specify an array of custom vmx settings to add (or to override
+    #    existing settings).   ****  I don't do any validation, so if you
+    #    make any errors, it will not be caught ***   This is the place you would
+    #    add any special settings you need in your vmx.  (Like adding a USB, DVD
+    #    CPU settings, etc...).
+    #    ex vhv.enable = 'TRUE' will be appended, floppy0.presend = 'TRUE' will be modified
+    #esxi.custom_vmx_settings = [['vhv.enable','TRUE'], ['floppy0.present','TRUE']]
+
+    #  OPTIONAL. lax
+    #    If unspecified, the ovftool option --lax is disabled.   If you are
+    #    importing ovf boxes that generate errors, you may want to enable lax
+    #    to convert the errors to warning. (then the import could succeed)
+    #esxi.lax = 'true'
+
     #  DANGEROUS!  Allow Overwrite
     #    If unspecified, the default is to produce an error if overwriting
     #    vm's and packages.

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

@@ -107,7 +107,7 @@ module VagrantPlugins
                !config.vm_disk_store.nil?
               env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                    message: 'WARNING         : '\
-                                            "#{config.vm_disk_store} not "\
+                                            "Disk Store \"#{config.vm_disk_store}\" not "\
                                             "found, using #{@guestvm_dsname}")
             end
 
@@ -176,22 +176,46 @@ module VagrantPlugins
           new_vmx_contents = ''
           File.readlines(vmx_file).each do |line|
 
-            if line.match(/^displayname =/i)
+            case line
+            when /^displayname =/i
               new_vmx_contents << "displayname = \"#{guestvm_vmname}\"\n"
-            elsif line.match(/^memsize =/i) && (!desired_memsize.nil?)
-              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(/^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
+            when /^memsize =/i
+              if desired_memsize.nil?
+                new_vmx_contents << line
+              else
+                new_vmx_contents << "memsize = \"#{desired_memsize}\"\n"
+              end
+            when /^numvcpus =/i
+              if desired_numvcpus.nil?
+                new_vmx_contents << line
+              else
+                new_vmx_contents << "numvcpus = \"#{desired_numvcpus}\"\n"
+              end
+            when /^ethernet[0-9]/i
+              # Do nothing, delete these lines, we'll fix it later.
+            when /^guestOS = /i
+
+              in_vmx_guestos = line.gsub(/^guestOS = /i, '').gsub(/\"/, '').strip
+              if config.guestos.nil?
+                config.guestos = in_vmx_guestos
+                new_vmx_contents << line
+              else
+                if config.supported_guestos.include? config.guestos.downcase
+                  config.guestos = config.guestos.downcase.strip
+                  new_vmx_contents << "guestOS = \"#{config.guestos}\"\n"
+                else
+                  env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                       message: 'WARNING         : '\
+                                                "GuestOS: #{config.guestos} not "\
+                                                "supported, using box/ovftool defaults")
+                  config.guestos = in_vmx_guestos
+                  new_vmx_contents << line
+                end
+              end
             else
               new_vmx_contents << line
             end
+
           end
 
           #  finalize vmx.
@@ -220,7 +244,7 @@ module VagrantPlugins
             end
           end
 
-          #  Write new vmx file
+          #  Write new vmx file on local filesystem
           filename_only = File.basename vmx_file, '.vmx'
           path_only = File.dirname vmx_file
           new_vmx_file = "#{path_only}/ZZZZ_#{guestvm_vmname}.vmx"
@@ -231,7 +255,9 @@ module VagrantPlugins
           }
 
           #
-          #  Check if using a Resource Pool
+          #  Do some validations, set defaults...
+          #
+          #  Validate if using a Resource Pool
           if config.resource_pool.is_a? String
             if config.resource_pool =~ %r{^\/}
               resource_pool = config.resource_pool
@@ -269,35 +295,69 @@ module VagrantPlugins
           end
 
           #  Validate nic types
-          unless config.nic_type.nil?
-            if config.nic_type =~ /Vlance/i
-              config.nic_type = 'Vlance'
-            elsif config.nic_type =~ /Flexible/i
-              config.nic_type = 'Flexible'
-            elsif config.nic_type =~ /e1000$/i
-              config.nic_type = 'e1000'
-            elsif config.nic_type =~ /e1000e$/i
-              config.nic_type = 'e1000e'
-            elsif config.nic_type =~ /vmxnet$/i
-              config.nic_type = 'vmxnet'
-            elsif config.nic_type =~ /vmxnet2$/i
-              config.nic_type = 'vmxnet2'
-            elsif config.nic_type =~ /vmxnet3$/i
-              config.nic_type = 'vmxnet3'
+          if config.nic_type.nil?
+            nic_type = nil
+          else
+            if config.supported_nic_types.include?(config.nic_type.downcase)
+              nic_type = config.nic_type.downcase
             else
-              config.nic_type = 'e1000'
+              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                   message: 'WARNING         : '\
+                                            "NIC type: #{config.nic_type} not "\
+                                            "found, using ovftool defaults.")
+              nic_type = nil
             end
           end
 
-
-          #
-          #  Display build summary
+          #  Validate cpus and memory
           numvcpus = new_vmx_contents.match(/^numvcpus =.*/i)
                      .to_s.gsub(/^numvcpus =/i, '').gsub(/\"/, '')
           memsize = new_vmx_contents.match(/^memsize =.*/i)
                     .to_s.gsub(/^memsize =/i, '').gsub(/\"/, '')
-          guestOS = new_vmx_contents.match(/^guestOS =.*/i)
-                    .to_s.gsub(/^guestOS =/i, '').gsub(/\"/, '')
+
+          #  Validate disk types (thin, thick, etc...)
+          if config.vm_disk_type.nil?
+            vm_disk_type = "thin"
+          else
+            if config.supported_vm_disk_types.include? config.vm_disk_type.downcase
+              vm_disk_type = config.vm_disk_type.downcase
+            else
+              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                   message: 'WARNING         : '\
+                                            "Disk type: #{config.vm_disk_type} not "\
+                                            "found, using \"thin\"")
+              vm_disk_type = "thin"
+            end
+          end
+
+          #  Validate virtual HW levels
+          unless config.virtualhw_version.nil?
+            if config.supported_virtualhw_versions.include? config.virtualhw_version.to_i
+              virtualhw_version = config.virtualhw_version.to_i.to_s
+            else
+              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                    message: 'WARNING         : '\
+                                             "Invalid virtualhw_version: #{config.virtualhw_version},"\
+                                             " using ovftool defaults")
+              virtualhw_version = nil
+            end
+          end
+
+          # Validate lax setting (use relaxed (--lax) ovftool option)
+          unless config.lax.nil?
+            if config.lax == 'True'
+              laxoption = '--lax'
+            else
+              laxoption = ''
+            end
+          end
+
+
+          #
+          #  Print summary
+          #
+          env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                               message: "")
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "ESXi host       : #{config.esxi_hostname}")
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
@@ -306,23 +366,35 @@ module VagrantPlugins
                                message: "Box             : #{env[:machine].box.name}")
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "Box Ver         : #{env[:machine].box.version}")
+          env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                               message: "Disk Store      : #{@guestvm_dsname}")
+          unless virtualhw_version.nil?
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Virtual HW ver  : #{virtualhw_version}")
+          end
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "CPUS            :#{numvcpus}")
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "Memsize (MB)    :#{memsize}")
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                               message: "Guest OS type   :#{guestOS}")
-          env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                               message: "Disk Store      : #{@guestvm_dsname}")
+                               message: "Guest OS type   : #{config.guestos}")
+          unless config.vm_disk_type.nil?
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Disk Type       : #{vm_disk_type}")
+          end
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "Virtual Network : #{@guestvm_network[0..3]}")
           unless config.mac_address[0].eql? ''
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "Mac Address     : #{config.mac_address}")
           end
-          unless config.nic_type.nil?
+          unless nic_type.nil?
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Nic Type        : #{nic_type}")
+          end
+          if config.lax == 'True'
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                 message: "Nic Type        : #{config.nic_type}")
+                                 message: "Relaxed (--lax) : #{config.lax}")
           end
           unless overwrite_opts.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
@@ -341,7 +413,7 @@ module VagrantPlugins
                            '  install from http://www.vmware.com.'
           end
           ovf_cmd = "ovftool --noSSLVerify #{overwrite_opts} "\
-                "#{netOpts} -dm=thin "\
+                "#{netOpts} -dm=#{vm_disk_type} #{laxoption} "\
                 "-ds=\"#{@guestvm_dsname}\" --name=\"#{guestvm_vmname}\" "\
                 "\"#{new_vmx_file}\" vi://#{config.esxi_username}:"\
                 "#{$encoded_esxi_password}@#{config.esxi_hostname}"\
@@ -408,28 +480,50 @@ module VagrantPlugins
             esxi_orig_vmx_file = ssh.exec!("cat #{dst_vmx_file} 2>/dev/null")
             if (config.debug =~ %r{vmx}i)
               puts "orig vmx: #{esxi_orig_vmx_file}"
+              puts "\n\n"
             end
             if esxi_orig_vmx_file.exitstatus != 0
               raise Errors::ESXiError,
                     message: "Unable to read #{dst_vmx_file}"
             end
 
-            #  read each line in vmx to configure mac and nic type.
+            #  read each line in vmx to customize
             new_vmx_contents = ''
             vmx_need_change_flag = false
             esxi_orig_vmx_file.each_line do |line|
-              if line.match(/^ethernet[0-9]/i)
+
+              case line
+
+              # configure virtualHW ver
+              when /^virtualHW.version = /i
+                if virtualhw_version.nil?
+                  new_vmx_contents << line
+                else
+                  new_vmx_contents << "virtualHW.version = \"#{virtualhw_version}\"\n"
+                  vmx_need_change_flag = true
+                end
+
+              when /^guestOS = /i
+                if config.guestos.nil?
+                  new_vmx_contents << line
+                else
+                  new_vmx_contents << "guestOS = \"#{config.guestos}\"\n"
+                  vmx_need_change_flag = true
+                end
+
+              # configure mac and nic type.
+              when /^ethernet[0-9]/i
                 nicindex = line[8].to_i
                 if line.match(/^ethernet[0-9].networkName = /i)
                   new_vmx_contents << line
                 elsif line.match(/^ethernet0.virtualDev = /i)
                   #  Update nic_type if it's set, otherwise, save eth0 nic_type
                   #  for the remaining nics.  (ovftool doesn't set it...)
-                  if config.nic_type.nil?
-                    config.nic_type = line.gsub(/ethernet0.virtualDev = /i, '').gsub('"', '').strip
+                  if nic_type.nil?
+                    nic_type = line.gsub(/ethernet0.virtualDev = /i, '').gsub('"', '').strip
                     new_vmx_contents << line
                   else
-                    new_vmx_contents << line.gsub(/ = .*$/, " = \"#{config.nic_type}\"\n")
+                    new_vmx_contents << line.gsub(/ = .*$/, " = \"#{nic_type}\"\n")
                     vmx_need_change_flag = true
                   end
                 elsif (line.match(/^ethernet[0-9].addressType = /i) &&
@@ -449,13 +543,27 @@ module VagrantPlugins
                   end
                 end
               else
-                new_vmx_contents << line
+                line_changed = false
+                if config.custom_vmx_settings.is_a? Array
+                  env[:machine].provider_config.custom_vmx_settings.each do |k, v|
+                    if line =~ /#{k} = /
+                      new_vmx_contents << "#{k} = \"#{v}\"\n"
+                      vmx_need_change_flag = true
+                      line_changed = true
+                      env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                           message: "Custom vmx      : Modify #{k} = \"#{v}\"")
+                    end
+                  end
+                end
+                if line_changed == false
+                  new_vmx_contents << line
+                end
               end
             end
 
             #  For all nics, configure nic_type and enable nics
-            if config.nic_type.nil?
-              config.nic_type = "e1000"
+            if nic_type.nil?
+              nic_type = "e1000"
             end
             if config.virtual_network.is_a? Array
               number_of_adapters = config.virtual_network.count
@@ -465,8 +573,8 @@ module VagrantPlugins
 
             1.upto(number_of_adapters) do |index|
               nic_index = index - 1
-              unless new_vmx_contents =~ /ethernet#{nic_index}.virtualDev = \"#{config.nic_type}\"/i
-                new_vmx_contents << "ethernet#{nic_index}.virtualDev = \"#{config.nic_type}\"\n"
+              unless new_vmx_contents =~ /ethernet#{nic_index}.virtualDev = \"#{nic_type}\"/i
+                new_vmx_contents << "ethernet#{nic_index}.virtualDev = \"#{nic_type}\"\n"
                 vmx_need_change_flag = true
               end
               unless new_vmx_contents =~ /ethernet#{nic_index}.present = \"TRUE\"/i
@@ -475,11 +583,15 @@ module VagrantPlugins
               end
             end
 
-            # append custom_vmx_settings if exists
+            # append custom_vmx_settings if not yet in vmx
             if config.custom_vmx_settings.is_a? Array
               env[:machine].provider_config.custom_vmx_settings.each do |k, v|
-                new_vmx_contents << "#{k} = \"#{v}\"\n"
-                vmx_need_change_flag = true
+                unless new_vmx_contents =~ /#{k} = /
+                  new_vmx_contents << "#{k} = \"#{v}\"\n"
+                  vmx_need_change_flag = true
+                  env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                       message: "Custom vmx      : Append #{k} = \"#{v}\"")
+                end
               end
             end
 
@@ -487,6 +599,7 @@ module VagrantPlugins
             if vmx_need_change_flag == true
               if (config.debug =~ %r{vmx}i)
                 puts "new vmx: #{new_vmx_contents}"
+                puts "\n\n"
               end
               r = ''
               ssh.open_channel do |channel|

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

@@ -107,7 +107,8 @@ module VagrantPlugins
             '&', '%26').gsub(':', '%3a').gsub(\
             '/', '%2f').gsub('\\','%5c').gsub(\
             '"', '%22').gsub('\'','%27').gsub(\
-            '*', '%2a').gsub('?', '%3f')
+            '*', '%2a').gsub('?', '%3f').gsub(\
+            '$', '%24')
 
           @logger.info('vagrant-vmware-esxi, connect_esxi: esxi_private_keys: '\
                        "#{config.esxi_private_keys}")

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

@@ -67,14 +67,14 @@ module VagrantPlugins
             ssh_execute_cmd << 'grep "uptimeSeconds ="|sed "s/^.*= //g"|sed s/,//g'
             uptime = ssh.exec!(ssh_execute_cmd)
 
-            if ( r.length == 0 && uptime.to_i > 60)
+            if ( r.length == 0 && uptime.to_i > 120)
               ipaddress = r2.strip
             else
               ipaddress = r.strip
             end
 
             if (config.debug =~ %r{ip}i)
-              puts "ip1: |#{r.strip}| ip2: |#{r2.strip}|  ipaddress: #{ipaddress}"
+              puts "ip1 (prim):#{r.strip} ip2 (alt):#{r2.strip}  Final: #{ipaddress}"
             end
 
             return nil if (ipaddress == '')

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

@@ -13,17 +13,26 @@ module VagrantPlugins
       attr_accessor :private_key_path
       attr_accessor :vmname
       attr_accessor :vmname_prefix
+      attr_accessor :guestos
       attr_accessor :vm_disk_store
+      attr_accessor :vm_disk_type
       attr_accessor :virtual_network
       attr_accessor :nic_type
       attr_accessor :mac_address
       attr_accessor :resource_pool
       attr_accessor :memsize
       attr_accessor :numvcpus
+      attr_accessor :virtualhw_version
       attr_accessor :custom_vmx_settings
       attr_accessor :allow_overwrite
       attr_accessor :debug
+      attr_accessor :lax
       attr_accessor :system_private_keys_path
+      attr_accessor :supported_virtualhw_versions
+      attr_accessor :supported_vm_disk_types
+      attr_accessor :supported_nic_types
+      attr_accessor :supported_guestos
+
       def initialize
         @esxi_hostname = nil
         @esxi_hostport = 22
@@ -34,29 +43,206 @@ module VagrantPlugins
         @private_key_path = UNSET_VALUE
         @vmname = nil
         @vmname_prefix = 'V-'
+        @guestos = nil
         @vm_disk_store = nil
+        @vm_disk_type = nil
         @virtual_network = nil
         @nic_type = nil
         @mac_address = ["","","",""]
         @resource_pool = nil
         @memsize = UNSET_VALUE
         @numvcpus = UNSET_VALUE
+        @virtualhw_version = nil
         @custom_vmx_settings = UNSET_VALUE
         @allow_overwrite = 'False'
         @debug = 'False'
+        @lax = 'False'
         @system_private_keys_path = [
           '~/.ssh/id_rsa',
           '~/.ssh/id_ecdsa',
           '~/.ssh/id_ed25519',
           '~/.ssh/id_dsa'
         ]
+        @supported_virtualhw_versions = [
+          4,7,8,9,10,11,12,13
+        ]
+        @supported_vm_disk_types = [
+          'thin',
+          'thick',
+          'eagerzeroedthick'
+        ]
+        @supported_nic_types = [
+          'vlance',
+          'flexible',
+          'e1000',
+          'e1000e',
+          'vmxnet',
+          'vmxnet2',
+          'vmxnet3'
+        ]
+        @supported_guestos = [
+          'asianux3-64',
+          'asianux3',
+          'asianux4-64',
+          'asianux4',
+          'asianux5-64',
+          'asianux7-64',
+          'centos6-64',
+          'centos-64',
+          'centos6',
+          'centos7-64',
+          'centos7',
+          'centos',
+          'coreos-64',
+          'darwin10-64',
+          'darwin10',
+          'darwin11-64',
+          'darwin11',
+          'darwin12-64',
+          'darwin13-64',
+          'darwin14-64',
+          'darwin15-64',
+          'darwin16-64',
+          'darwin-64',
+          'darwin',
+          'debian10-64',
+          'debian10',
+          'debian4-64',
+          'debian4',
+          'debian5-64',
+          'debian5',
+          'debian6-64',
+          'debian6',
+          'debian7-64',
+          'debian7',
+          'debian8-64',
+          'debian8',
+          'debian9-64',
+          'debian9',
+          'dos',
+          'eComStation2',
+          'eComStation',
+          'fedora-64',
+          'fedora',
+          'freebsd-64',
+          'freebsd',
+          'genericLinux',
+          'mandrake',
+          'mandriva-64',
+          'mandriva',
+          'netware4',
+          'netware5',
+          'netware6',
+          'nld9',
+          'oes',
+          'openServer5',
+          'openServer6',
+          'opensuse-64',
+          'opensuse',
+          'oracleLinux6-64',
+          'oracleLinux-64',
+          'oracleLinux6',
+          'oracleLinux7-64',
+          'oracleLinux7',
+          'oracleLinux',
+          'os2',
+          'other24xLinux-64',
+          'other24xLinux',
+          'other26xLinux-64',
+          'other26xLinux',
+          'other3xLinux-64',
+          'other3xLinux',
+          'other',
+          'otherGuest-64',
+          'otherLinux-64',
+          'otherLinux',
+          'redhat',
+          'rhel2',
+          'rhel3-64',
+          'rhel3',
+          'rhel4-64',
+          'rhel4',
+          'rhel5-64',
+          'rhel5',
+          'rhel6-64',
+          'rhel6',
+          'rhel7-64',
+          'rhel7',
+          'sjds',
+          'sles10-64',
+          'sles10',
+          'sles11-64',
+          'sles11',
+          'sles12-64',
+          'sles12',
+          'sles-64',
+          'sles',
+          'solaris10-64',
+          'solaris10',
+          'solaris11-64',
+          'solaris6',
+          'solaris7',
+          'solaris8',
+          'solaris9',
+          'suse-64',
+          'suse',
+          'turboLinux-64',
+          'turboLinux',
+          'ubuntu-64',
+          'ubuntu',
+          'unixWare7',
+          'vmkernel5',
+          'vmkernel65',
+          'vmkernel6',
+          'vmkernel',
+          'vmwarePhoton-64',
+          'win2000AdvServ',
+          'win2000Pro',
+          'win2000Serv',
+          'win31',
+          'win95',
+          'win98',
+          'windows7-64',
+          'windows7',
+          'windows7Server-64',
+          'windows8-64',
+          'windows8',
+          'windows8Server-64',
+          'windows9-64',
+          'windows9',
+          'windows9Server-64',
+          'windowsHyperV',
+          'winLonghorn-64',
+          'winLonghorn',
+          'winMe',
+          'winNetBusiness',
+          'winNetDatacenter-64',
+          'winNetDatacenter',
+          'winNetEnterprise-64',
+          'winNetEnterprise',
+          'winNetStandard-64',
+          'winNetStandard',
+          'winNetWeb',
+          'winNT',
+          'winVista-64',
+          'winVista',
+          'winXPHome',
+          'winXPPro-64',
+          'winXPPro'
+        ]
       end
 
       def finalize!
         @private_key_path = nil if @private_key_path == UNSET_VALUE
         @ssh_username = nil if @ssh_username == UNSET_VALUE
         @esxi_private_keys = @system_private_keys_path if @esxi_private_keys == UNSET_VALUE
-      end
+        if @lax =~ /true/i
+          @lax = 'True'
+        else
+          @lax = 'False'
+        @virtualhw_version = @virtualhw_version.to_i unless @virtualhw_version.nil?
+       end
+     end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '1.4.0'
+    VERSION = '1.5.0'
   end
 end

data/vagrant-vmware-esxi.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/vagrant-vmware-esxi/version', __FILE__)
 Gem::Specification.new do |s|
   s.name            = 'vagrant-vmware-esxi'
   s.version         = VagrantPlugins::ESXi::VERSION
-  s.date            = '2018-01-17'
+  s.date            = '2018-01-23'
   s.summary         = 'Vagrant ESXi provider plugin'
   s.description     = 'A Vagrant plugin that adds a VMware ESXi provider support'
   s.authors         = ['Jonathan Senkerik']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jonathan Senkerik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n