vagrant-vmware-esxi 2.4.2 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3fbcbcf238cd9c3004f555ba0f621146df5a3438
-  data.tar.gz: a73ab4958864e6267ce091d2dd917a2bd4f487b7
+SHA256:
+  metadata.gz: 40331b3198d6a85293719e3bd1c529ce7d01de80f151b2cdeed7aa771e0f127a
+  data.tar.gz: a500020408fe69d6d81a057a390013cb8f3d897d062fc7a634ff243c018743b1
 SHA512:
-  metadata.gz: 0a6981d7ec2a2a09768d8f96ef7bca408fb5c76f3287e20b807fd12c28add2a68f4071c44d866d798fd3560d94b6abd58d1b57b0f497a705376295557c652473
-  data.tar.gz: c1d51476360b5345f7a9634a6cc5d82c4535644946fa578cb54697abc538ecf4a9613d5bb226d44e46372be1ffe887367fa380930e5b49ef3b6a2400ab0c6497
+  metadata.gz: eacbdb2b3d689b16cfe45c36ee7fe42d475ea3a3e6f4f19de22cb034bc1922d8bd9585449ed537894e99a9f2b94c7a50a1326bbf30261f193016d6a964020d55
+  data.tar.gz: 736975fe3243fd1f847048e9131e619a27788279b03eae7518c54dd4910f7506ad6c3d7549fdadab0ca3190e7ac3a13133365dbcad6b0bdf3db8b11832e03284

data/ESXi_guestos_types.md

@@ -3,7 +3,8 @@ VMware ESXi 6.5 guestOS types
 
 Based on my research and some trial & error, I made this list of guestOS types that are compatible with ESXi 6.5.  I started with some api documenation from vmware that listed guestOS types.
 
->http://pubs.vmware.com/vsphere-6-5/index.jsp#com.vmware.wssdk.apiref.doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
+>http://pubs.vmware.com/vsphere-65/topic/com.vmware.wssdk.apiref.doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
+>https://code.vmware.com/apis/358/vsphere#/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
 
 But they didn't quite work when put directly in the vmx file...   I noticed none of my existing vmx files had the word "Guest" in guestOS line.  I also noticed in the list that the 64 bit entries were inconsistent.  (Some have _64, others are -64, and others are just 64.)   I removed the word Guest and set all the 64 bit OS's to be standard "-64".  The results seems to work for various OS's I installed, but I certainly didn't try all of these.    So here is my list...  Please report any errors.
 

data/Gemfile

@@ -1,9 +1,24 @@
-source 'https://rubygems.org'
+#source 'https://rubygems.org'
+#
+#group :development do
+#  #gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git', :branch => 'v2.2.3'
+#  gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git'
+#end
+#
+#group :plugins do
+#  #gemspec
+#  gem "vagrant-vmware-esxi", path: "."
+#end
+
+source "https://rubygems.org"
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git'
+  # Need to tag to 2.2.4, there is still a bug.
+  # https://github.com/hashicorp/vagrant/pull/10945
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git", :tag => 'v2.2.4'
 end
 
 group :plugins do
-  gemspec
+  gem "vagrant-vmware-esxi", path: "."
 end
+

data/Gemfile.path

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'vagrant', path: '../vagrant'  # checked out 'cca36d9'

data/README.md

@@ -3,26 +3,25 @@ vagrant-vmware-esxi plugin
 This is a Vagrant plugin that adds a VMware ESXi provider support.  This allows Vagrant to control and provision VMs directly on an ESXi hypervisor without a need for vCenter or VShpere.   ESXi hypervisor is a free download from VMware!
 >https://www.vmware.com/go/get-free-esxi
 
+
 Documentation:
 -------------
 Refer to the WIKI for documentation, examples and other information...  
 >https://github.com/josenk/vagrant-vmware-esxi/wiki
 
 
-Looking for volunteers to help with terraform-provider-esxi
------------------------------------------------------------
-If you are using vagrant as an esxi vm deployment tool (infa as code), you may want to consider a better tool.  Terraform.   Please give my terraform plugin a try and give me some feedback.  What you're trying to do, what's missing, what works, what doesn't work, etc...
+Vagrant vs Terraform.
+---------------------
+If you are using vagrant as a deployment tool (infra as code), you may want to consider a better tool:  Terraform.  Vagrant is better for development environments, while Terraform is better at managing infrastructure.  Please give my Terraform plugin a try and give me some feedback.  What you're trying to do, what's missing, what works, what doesn't work, etc...
+>https://www.vagrantup.com/intro/vs/terraform.html
+
 >https://github.com/josenk/terraform-provider-esxi
+>https://github.com/josenk/vagrant-vmware-esxi
 
 
-What's new!
------------
-Added support to clone from a VM!   Refer to the WIKI for documentation, example and other information.
->https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm
-
 Features and Compatibility
 --------------------------
-* Clone from VMs.  Clone a VM on the esxi host instead of transferring a box stored on your local pc.
+* Clone from VMs.  (see wiki)  Clone a VM on the ESXi host instead of transferring a box stored on your local pc.
 * 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.
@@ -35,7 +34,7 @@ Features and Compatibility
 * suspend, resume, snapshots.
 * rsync & NFS using built-in Vagrant synced folders.
 * Provision using built-in Vagrant provisioner.
-* package your vm's into boxes.
+* package your VMs into boxes.
 * Create additional network interfaces, set nic type, MAC addresses, static IPs.
 * Use Vagrants private_network, public_network options to set a static IP addresses on additional network interfaces.  (not the primary interface)
 * Disks can be provisioned using thin, thick or eagerzeroedthick.
@@ -43,15 +42,17 @@ Features and Compatibility
 * Specify GuestOS types, virtual HW version.
 * Any custom vmx settings can be added or modified.
 
+
 Requirements
 ------------
 1. This is a vagrant plugin, so you need vagrant installed...  :-)
 2. This plugin requires ovftool from VMware.  Download from VMware website.  NOTE: 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.
 >https://www.vmware.com/support/developer/ovf/
 3. You MUST enable ssh access on your ESXi hypervisor.
-  * Google 'How to enable ssh access on esxi'
+  * Google 'How to enable ssh access on ESXi'
 4. The boxes must have open-vm-tools or vmware-tools installed to properly transition to the 'running' state.
 5. In general, you should know how to use vagrant, esxi and some networking...
+6. You will most likely need a DHCP server on your primary network if you are deploying public boxes.
 
 Why this plugin?
 ----------------
@@ -111,7 +112,7 @@ Vagrant.configure('2') do |config|
   #  optionally netmask.  ESXi doesn't use the concept of public or private
   #  networks so both are valid here.  The primary network interface is considered the
   #  "vagrant management" interface and cannot be changed and this plugin
-  #  supports 4 NICS, so you can specify 3 entries here!
+  #  supports 10 NICS, so you can specify 9 entries here!
   #
   #  https://www.vagrantup.com/docs/networking/public_network.html
   #  https://www.vagrantup.com/docs/networking/private_network.html
@@ -146,7 +147,7 @@ Vagrant.configure('2') do |config|
 
     #  HIGHLY RECOMMENDED!  ESXi Virtual Network
     #    You should specify an ESXi Virtual Network!  If it's not specified, the
-    #    default is to use the first found.  You can specify up to 4 virtual
+    #    default is to use the first found.  You can specify up to 10 virtual
     #    networks using an array format.
     #esxi.esxi_virtual_network = ['VM Network','VM Network2','VM Network3','VM Network4']
 
@@ -168,10 +169,9 @@ Vagrant.configure('2') do |config|
     #    The Default will be automatically generated.
     #esxi.guest_name = 'Custom-Guest-VM_Name'
 
-    #  OPTIONAL.  When automatically naming VMs, use this prifix.
+    #  OPTIONAL.  When automatically naming VMs, use this prefix.
     #esxi.guest_name_prefix = 'V-'
 
-
     #  OPTIONAL.  Set the guest username login.  The default is 'vagrant'.
     #esxi.guest_username = 'vagrant'
 
@@ -181,7 +181,7 @@ Vagrant.configure('2') do |config|
     #  OPTIONAL.  Virtual CPUs override
     #esxi.guest_numvcpus = '2'
 
-    #  OPTIONAL & RISKY.  Specify up to 4 MAC addresses
+    #  OPTIONAL & RISKY.  Specify up to 10 MAC addresses
     #    The default is ovftool to automatically generate a MAC address.
     #    You can specify an array of MAC addresses using upper or lower case,
     #    separated by colons ':'.
@@ -215,13 +215,17 @@ Vagrant.configure('2') do |config|
     #esxi.guest_snapshot_quiesced = 'true'
 
     #  RISKY. guest_guestos
-    #    https://github.com/josenk/vagrant-vmware-esxi/ESXi_guest_guestos_types.md
+    #    https://github.com/josenk/vagrant-vmware-esxi/wiki/VMware-ESXi-6.5-guestOS-types
     #esxi.guest_guestos = 'centos-64'
 
     #  OPTIONAL. guest_virtualhw_version
     #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12,13 & 14.
     #esxi.guest_virtualhw_version = '9'
 
+    #  OPTIONAL. Guest Autostart
+    #    Guest VM will autostart when esxi host is booted. 'true' or 'false'(default)
+    #esxi.guest_autostart = 'false'
+
     #  RISKY. guest_custom_vmx_settings
     #esxi.guest_custom_vmx_settings = [['vhv.enable','TRUE'], ['floppy0.present','TRUE']]
 
@@ -233,11 +237,11 @@ Vagrant.configure('2') do |config|
 
     #  DANGEROUS!  Allow Overwrite
     #    If unspecified, the default is to produce an error if overwriting
-    #    vm's and packages.
+    #    VMs and packages.
     #esxi.local_allow_overwrite = 'True'
 
     #  Advanced Users.
-    #    If set to 'True', all WARNINGS will produce a FAILURE and vagrant will stop.
+    #    If set to 'True', all WARNINGS will produce a FAILURE and Vagrant will stop.
     #esxi.local_failonwarning = 'True'
 
     #  Plugin debug output.
@@ -265,23 +269,17 @@ Basic usage
   * `vagrant snapshot pop`  
   * `vagrant halt`
   * `vagrant provision`
-  * `vagrant address`   # esxi provided plugin. Output IP address of guest.
-
+  * `vagrant address`   # ESXi provided plugin. Output IP address of guest.
 
 
-Upgrading from vagrant-vmware-esxi 1.x.x
-----------------------------------------
-See wiki for more information.
->https://github.com/josenk/vagrant-vmware-esxi/wiki/Upgrading-from-vagrant-vmware-esxi-1.x.x
-
 
 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, guest_custom_vmx_settings) could cause 'vagrant up' to fail.  Review vSphere console and/or ESXi logs to help debug why it failed.
-* If you break an install ([CTRL]-C), the cleanup task doesn't always destroy the VM that has been partially built.  To resolve this, use the local_allow_overwrite = 'True' Vagrantfile option if you want to force a rebuild, or you can 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.
-* Vagrant NFS synced folders cannot not 100% reliable on multi-homed clients (your vagrant pc/laptop/host).  There is no 100% reliable way to know which IP is the correct, most reliable, most desirable, way to reach the vm guest.
+* If you break an install ([CTRL]-C), the cleanup task doesn't always destroy the VM that has been partially built.  To resolve this, use the local_allow_overwrite = 'True' Vagrantfile option if you want to force a rebuild, or you can 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.
+* Vagrant NFS synced folders cannot not be 100% reliable on multi-homed clients (your Vagrant pc/laptop/host).  There is no 100% reliable way to know which IP is the correct, most reliable, most desirable, way to reach the VM guest.
 * Plugin V2.0.1 - 2.0.5 is not compatible with Windows (to support ed25519 ssh keys, net-ssh requires libsodium but it's not compatible with Windows).  ed25519 support has been removed for now.   It will be added back when net-ssh 5.x goes out of beta.
 * Vagrant 2.1.0 is not compatible with this plugin. Avoid Vagrant 2.1.0.
 * Cygwin & gitbash have console issues. Ruby module io/console does not have support.  https://github.com/ruby/io-console/issues/2
@@ -290,10 +288,16 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
-* 2.4.2 Fix i18n dependancy.
-* 2.4.1 Change/Fix output of 'vagrant address' when a single machine is configured or specifed.
-
-* 2.4.0 Add support for 'vagrant address', output ip address of guest.
+* 2.5.1 Fix, filter localhost from local IP detection for nfs sync.
+* 2.5.0 Add support to set guest vm to Autostart.
+* 2.4.5 Do not wait for `running` when resuming a VM that is not able to be resumed.
+* 2.4.4 Show stderr if unable to connect to ESXi host. Update GuestOS types.
+* 2.4.3 Update GuestOS types.
+* 2.4.3 Fix, Allow disk stores with "(" or ")" in their name.  Add support for up to 10 virtual NICs
+* 2.4.2 Fix i18n dependency.
+* 2.4.1 Change/Fix output of 'vagrant address' when a single machine is configured or specified.
+
+* 2.4.0 Add support for 'vagrant address', output IP address of guest.
         Fix, exit 1 on vagrant up if unable to reach "running" state.
         Some code cleanup.
 
@@ -303,16 +307,16 @@ Version History
 
 * 2.3.0 Add support to specify DiskStore for guest_storage virtual disks.
         Add local_failonwarning Vagrantfile option.
-        Fix, make plugin more compatible with Ovftool 4.3.0
+        Fix, make plugin more compatible with OVFTool 4.3.0
 
 * 2.2.2 Fix, Avoid crash if esxi_password is nil.
 
 * 2.2.1 Fix, clone_from_vm not working on MAC.
         Fix, enabled SetHostname.
-        Fix, Multimachine not working with multiple esxi hosts and different passwords.
+        Fix, Multimachine not working with multiple ESXi hosts and different passwords.
 
 * 2.2.0 Add support to extend boot disk size.
-        Fix, add many more special characters to encode in esxi passwords.
+        Fix, add many more special characters to encode in ESXi passwords.
 
 * 2.1.0 Add support for clone_from_vm.
         Fix, use esxcli to get storage information.
@@ -320,22 +324,22 @@ Version History
 * 2.0.7 Fix, Doesn't wait for running when executing "vagrant reload"
         Fix, "vagrant halt" will now attempt a graceful shutdown before doing a hard power off.
 
-* 2.0.6 Fix Windows compatibility by not supporting ed25519 ssh keys.  When net-ssh 5.x is released AND vagrant allows it's use, I will support ed25519 again.
+* 2.0.6 Fix Windows compatibility by not supporting ed25519 ssh keys.  When net-ssh 5.x is released AND Vagrant allows its use, I will support ed25519 again.
         Fix, encode '/' in esxi passwords.
         Fix, Get local IP address for NFS syncd folders.  Filter out localhost 127.0.0.0/8.
         Work-around 'prompt:' issues with unsupported consoles. Cygwin & gitbash, for example.
 
 * 2.0.5 Performance enhancement. Guest IP caching
-        Performance enhancement. Optimize esxi connectivity checks.
+        Performance enhancement. Optimize ESXi connectivity checks.
         Performance enhancement & bugfix.  Get local IP address for NFS syncd folders.
-        Fix, unable to get VMID if getallvms command produces any errors (for other vms).
+        Fix, unable to get VMID if getallvms command produces any errors (for other VMs).
 
-* 2.0.2 Add support to add additional storage to guest vms.
-        Fix, encode (space) in esxi passwords.
+* 2.0.2 Add support to add additional storage to guest VMs.
+        Fix, encode (space) in ESXi passwords.
 
 * 2.0.1 Updated version:
         Most Vagrantfile options have been renamed to be consistent and for clarity.
-        vagrant up, more organized summary by esxi/guest options.
+        vagrant up, more organized summary by ESXi/guest options.
         Lots of Code cleanup.
         Add support for snapshot options (includeMemory & quiesced)
         Snapshot save/push adds a description.

data/example_box/Vagrantfile

@@ -141,7 +141,7 @@ Vagrant.configure('2') do |config|
     #    Otherwise you can set a fixed guest VM name here.
     #esxi.guest_name = 'Custom-Guest-VM_Name'
 
-    #  OPTIONAL.  When automatically naming VMs, use this prifix.
+    #  OPTIONAL.  When automatically naming VMs, use this prefix.
     #esxi.guest_name_prefix = 'V-'
 
     #  OPTIONAL.  Set the guest username login.  The default is 'vagrant'.
@@ -219,6 +219,13 @@ Vagrant.configure('2') do |config|
     #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12,13 & 14.
     #esxi.guest_virtualhw_version = '9'
 
+    #  OPTIONAL. guest_autostart
+    #    If unspecified, the guest VM will not autostart.  Set this to 'true' if
+    #    you want the guest VM to autostart when the esxi host is booted.  The autostart
+    #    options are all DEFAULT and there is no options in this plugin to modify them.
+    #    Valid options. 'true' or 'false'(default)
+    #esxi.guest_autostart = 'false'
+
     #  RISKY. guest_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

data/example_box/Vagrantfile-multimachine

@@ -1,33 +1,32 @@
 #
 #  Multi machine, essential options Vagrant file example. (documentation removed)
 #
+nodes = {
+   "vm-multi1" => ["hashicorp/precise64", 1, 1024, 21 ],
+   "vm-multi2" => ["generic/centos7",     2, 2048, 22 ],
+}
 
-nodes = [
-  { hostname: 'VM-multi1', box: 'hashicorp/precise64' },
-  { hostname: 'VM-multi2', box: 'hashicorp/precise64' }
-]
+Vagrant.configure(2) do |config|
+  nodes.each do | (name, cfg) |
+    box, numvcpus, memory, storage = cfg
 
-Vagrant.configure('2') do |config|
-  nodes.each do |node|
-    config.vm.define node[:hostname] do |node_config|
-      node_config.vm.hostname = node[:hostname]
-      node_config.vm.box = node[:box]
-      node_config.vm.synced_folder('.', '/Vagrantfiles', type: 'rsync')
-    end
-  end
+    config.vm.define name do |machine|
+      machine.vm.box   = box
+      machine.vm.hostname = name
+      machine.vm.synced_folder('.', '/Vagrantfiles', type: 'rsync')
 
-  config.vm.provider :vmware_esxi do |esxi|
-    #
-    #   Provider settings
-    #
-    esxi.esxi_hostname = 'esxi'
-    esxi.esxi_username = 'root'
-    esxi.esxi_password = 'file:'
-    #esxi.esxi_hostport = 22
-    #esxi.esxi_virtual_network = 'vmnet_example'
-    #esxi.esxi_disk_store = 'DS_001'
-    #esxi.esxi_resource_pool = '/Vagrant'
-    #esxi.guest_memsize = '2048'
-    #esxi.guest_numvcpus = '2'
+      machine.vm.provider :vmware_esxi do |esxi|
+        esxi.esxi_hostname         = 'esxi'
+        esxi.esxi_username         = 'root'
+        esxi.esxi_password         = 'file:'
+        esxi.esxi_virtual_network  = "VM Network"
+        esxi.guest_numvcpus        = numvcpus
+        esxi.guest_memsize         = memory
+        esxi.guest_storage         = storage
+        #esxi.clone_from_vm        = box
+        esxi.local_allow_overwrite = 'True'
+
+      end
+    end
   end
 end

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

@@ -47,9 +47,14 @@ module VagrantPlugins
       def self.action_resume
         Vagrant::Action::Builder.new.tap do |b|
           b.use SetESXiPassword
-          b.use ReadState
-          b.use Resume
-          b.use WaitForState, :running, 240
+          b.use Call, ReadState do |env1, b1|
+            if env1[:machine_state].to_s == 'not_created'
+              b1.use Resume
+            else
+              b1.use Resume
+              b1.use WaitForState, :running, 240
+            end
+          end
         end
       end
 

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

@@ -139,7 +139,8 @@ module VagrantPlugins
             #  Figure out DataStore
             r = ssh.exec!(
                     'esxcli storage filesystem list | grep "/vmfs/volumes/.*[VMFS|NFS]" | '\
-                    "awk -F'  ' '{print $NF\",\"$2}' | sort -n | awk -F',' '{print $2}'")
+                    "awk '{printf $NF\",\" ; for(i=2;i<=NF-5;++i)printf $i\"\"FS ; printf \"\\n\"}' | "\
+                    "sort -n | awk -F',' '{print $2}' | sed 's/ $//g'")
 
             availvolumes = r.split(/\n/)
             if config.debug =~ %r{true}i
@@ -287,7 +288,7 @@ module VagrantPlugins
                 @iswarning = 'true'
               end
               networkID += 1
-              break if networkID >= 4
+              break if networkID >= 10
             end
           end
 
@@ -480,7 +481,7 @@ module VagrantPlugins
           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',
-                              message: "Virtual Network : #{@guestvm_network[0..3]}")
+                              message: "Virtual Network : #{@guestvm_network[0..9]}")
           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',
@@ -505,7 +506,7 @@ module VagrantPlugins
                                message: "CPUS            : #{desired_guest_numvcpus}")
           unless config.guest_mac_address[0].eql? ''
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                 message: "Mac Address     : #{config.guest_mac_address[0..3]}")
+                                 message: "Mac Address     : #{config.guest_mac_address[0..9]}")
           end
           unless config.guest_nic_type.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
@@ -525,6 +526,10 @@ module VagrantPlugins
           end
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "Guest OS type   : #{desired_guestos}")
+          unless config.guest_autostart.nil?
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Autostart       : #{config.guest_autostart}")
+          end
           unless config.virtualhw_version.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "Virtual HW ver  : #{desired_virtualhw_version}")
@@ -626,7 +631,7 @@ module VagrantPlugins
 
 
             dst_vmx_file = "/vmfs/volumes/"
-            dst_vmx_file << dst_vmx_ds.gsub('[','').gsub(']','').strip + "/"
+            dst_vmx_file << dst_vmx_ds.gsub('[','').gsub(']','').gsub('(','\(').gsub(')','\)').strip + "/"
             esxi_guest_dir = dst_vmx_file + dst_vmx_dir
             dst_vmx_file << dst_vmx
             dst_vmx_file = dst_vmx_file.strip.gsub(/\s/, '\ ')
@@ -831,6 +836,23 @@ module VagrantPlugins
                     message: "Unable to reload vmx."
             end
 
+            if !config.guest_autostart.nil?
+              if config.guest_autostart.casecmp('true') == 0
+                startOrder = ssh.exec!('vim-cmd hostsvc/autostartmanager/get_autostartseq |grep startOrder |awk -F"=" "{print $2}" | sort -n |tail -1 |grep -o "[0-9]*"').to_i + 1
+                startDelay = ssh.exec!('vim-cmd hostsvc/autostartmanager/get_defaults |grep startDelay |grep -o "[0-9]*"').to_i
+                stopDelay = ssh.exec!('vim-cmd hostsvc/autostartmanager/get_defaults |grep stopDelay |grep -o "[0-9]*"').to_i
+
+                cmd = "vim-cmd hostsvc/autostartmanager/update_autostartentry "\
+                      "#{env[:machine].id} PowerOn #{startDelay} #{startOrder} systemDefault #{stopDelay} systemDefault"
+                puts "cmd: #{cmd}"
+                r = ssh.exec!(cmd)
+                if r.exitstatus != 0
+                  raise Errors::ESXiError,
+                        message: "Unable to set autostart."
+                end
+              end
+            end
+
             # Done
           end
         end

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

@@ -178,7 +178,8 @@ module VagrantPlugins
                   @logger.info('vagrant-vmware-esxi, set_esxi_password: '\
                                "ESXi version: #{esxi_version}")
                   raise Errors::ESXiError,
-                        message: 'Unable to connect to ESXi host!'
+                        message: 'Unable to connect to ESXi host!'\
+                                "Error: #{esxi_version}"
                 end
               end
             rescue
@@ -201,7 +202,8 @@ module VagrantPlugins
                           "ESXi host access : #{access_error_message}")
 
               raise Errors::ESXiError,
-                    message: 'Unable to connect to ESXi host!'
+                    message: 'Unable to connect to ESXi host! '\
+                            "Error: #{$!}"
             end
           end
         end

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

@@ -92,7 +92,7 @@ module VagrantPlugins
                              '  install from http://www.vmware.com.'
             end
 
-            ovf_cmd = "ovftool --noSSLVerify -tt=VMX --name=\"#{boxname}\" "\
+            ovf_cmd = "ovftool --noSSLVerify -tt=VMX --X:useMacNaming=false --name=\"#{boxname}\" "\
                       "#{overwrite_opts} vi://#{config.esxi_username}:"\
                       "#{config.encoded_esxi_password}@#{config.esxi_hostname}"\
                       "?moref=vim.VirtualMachine:#{machine.id} #{tmpdir}"

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

@@ -57,8 +57,8 @@ module VagrantPlugins
               #    Try to get first interface.  This is the prefered method
               #    when you have multiple network interfaces
               ssh_execute_cmd = "vim-cmd vmsvc/get.guest #{machine.id} 2>/dev/null |"
-              ssh_execute_cmd << 'grep -A 5 "deviceConfigId = 4000" |tail -1|'
-              ssh_execute_cmd << 'grep -oE "((1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])"'
+              ssh_execute_cmd << 'sed \'1!G;h;$!d\' |awk \'/deviceConfigId = 4000/,/ipAddress/\' |'
+              ssh_execute_cmd << 'grep -oE "((1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])" |tail -1'
               r = ssh.exec!(ssh_execute_cmd)
               ipaddress = r.strip
 

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

@@ -8,6 +8,7 @@ module VagrantPlugins
       # This action reads the state of the machine and puts it in the
       # `:machine_state_id` key in the environment.
       class ReadState
+        @@nfs_valid_ids = []
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_vmware_esxi::action::read_state')
@@ -17,18 +18,22 @@ module VagrantPlugins
           env[:machine_state] = read_state(env)
 
           #  Do NFS stuff
-          if (env[:machine_state].to_s.include? "running") && ($nfs_host_ip.nil?)
+          if (env[:machine_state].to_s.include? "running") && (@nfs_host_ip.nil?)
             ssh_info = env[:machine].ssh_info
             if defined?(ssh_info[:host])
               env[:nfs_machine_ip] = [ssh_info[:host]]
-              $nfs_machine_ip = [ssh_info[:host]].dup
-              env[:nfs_valid_ids] = [env[:machine].id]
-              $nfs_valid_ids = [env[:machine].id].dup
+              @nfs_machine_ip = [ssh_info[:host]].dup
+              @@nfs_valid_ids |= [env[:machine].id]
+              env[:nfs_valid_ids] = @@nfs_valid_ids
 
               begin
                 puts "Get local IP address for NFS. (pri)" if env[:machine].provider_config.debug =~ %r{ip}i
                 #  The Standard way to get your IP.  Get your hostname, resolv it.
-                env[:nfs_host_ip] = Socket::getaddrinfo(Socket.gethostname,"echo",Socket::AF_INET)[0][3]
+                addr_info = Socket::getaddrinfo(Socket.gethostname,"echo",Socket::AF_INET)
+
+                non_localhost = addr_info.select{ |info| info[3] !~ /^127./}
+
+                env[:nfs_host_ip] = non_localhost[0][3]
               rescue
                 puts "Get local IP address for NFS. (alt)" if env[:machine].provider_config.debug =~ %r{ip}i
                 #  Alt method.  Get list of ip_addresses on system and use the first.
@@ -40,7 +45,7 @@ module VagrantPlugins
                 end
               end
 
-              $nfs_host_ip = env[:nfs_host_ip].dup
+              @nfs_host_ip = env[:nfs_host_ip].dup
               if env[:nfs_host_ip].nil?
                 #  Something bad happened above.  Give up on NFS.
                 env[:nfs_machine_ip] = nil
@@ -56,9 +61,9 @@ module VagrantPlugins
             end
           else
             # Use Cached entries
-            env[:nfs_machine_ip] = $nfs_machine_ip
-            env[:nfs_host_ip] = $nfs_host_ip
-            env[:nfs_valid_ids] = $nfs_valid_ids
+            env[:nfs_machine_ip] = @nfs_machine_ip
+            env[:nfs_host_ip] = @nfs_host_ip
+            env[:nfs_valid_ids] = @@nfs_valid_ids
           end
 
           @app.call(env)

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

@@ -30,7 +30,7 @@ module VagrantPlugins
              (env[:machine_state].to_s == 'running')
             env[:ui].info I18n.t('vagrant_vmware_esxi.already_powered_on')
           elsif env[:machine_state].to_s == 'not_created'
-           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                 message: 'Cannot resume in this state')
           elsif (env[:machine_state].to_s == 'powered_off') ||
                 (env[:machine_state].to_s == 'suspended')

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

@@ -28,6 +28,7 @@ module VagrantPlugins
       attr_accessor :guest_snapshot_includememory
       attr_accessor :guest_snapshot_quiesced
       attr_accessor :guest_custom_vmx_settings
+      attr_accessor :guest_autostart
       attr_accessor :local_private_keys
       attr_accessor :local_allow_overwrite
       attr_accessor :local_lax
@@ -121,6 +122,7 @@ module VagrantPlugins
           'centos6',
           'centos7-64',
           'centos7',
+          'centos8-64',
           'centos',
           'coreos-64',
           'darwin10-64',
@@ -132,6 +134,9 @@ module VagrantPlugins
           'darwin14-64',
           'darwin15-64',
           'darwin16-64',
+          'darwin17-64',
+          'darwin18-64',
+          'darwin19-64',
           'darwin-64',
           'darwin',
           'debian10-64',
@@ -155,6 +160,10 @@ module VagrantPlugins
           'fedora',
           'freebsd-64',
           'freebsd',
+          'freebsd11-64',
+          'freebsd11',
+          'freebsd12-64',
+          'freebsd12',
           'genericlinux',
           'mandrake',
           'mandriva-64',
@@ -197,6 +206,7 @@ module VagrantPlugins
           'rhel6',
           'rhel7-64',
           'rhel7',
+          'rhel8-64',
           'sjds',
           'sles10-64',
           'sles10',

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

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.4.2'
+    VERSION = '2.5.1'
     $vagrant_vmware_esxi_version = VERSION
   end
 end

data/vagrant-vmware-esxi.gemspec

@@ -15,11 +15,15 @@ Gem::Specification.new do |s|
   s.files           = `git ls-files`.split($\)
   s.executables     = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files      = s.files.grep(%r{^(test|spec|features)/})
+  s.require_path    = 'lib'
 
   s.add_runtime_dependency 'i18n', '~> 1.0'
   s.add_runtime_dependency 'log4r', '~> 1.1'
   s.add_runtime_dependency "iniparse", '> 1.0'
-  s.add_runtime_dependency "nokogiri", '> 1.5'
+  s.add_runtime_dependency 'nokogiri', '~> 1.6'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
   # Needed only to support ed25519 ssh keys with net-ssh 4.x.  Won't need this for net-ssh 5.x.
   #s.add_runtime_dependency 'rbnacl', '>= 4.0', '< 5.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.1
 platform: ruby
 authors:
 - Jonathan Senkerik
@@ -56,16 +56,44 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 description: A Vagrant plugin that adds a VMware ESXi provider support
 email: josenk@jintegrate.co
 executables: []
@@ -74,6 +102,7 @@ extra_rdoc_files: []
 files:
 - ESXi_guestos_types.md
 - Gemfile
+- Gemfile.path
 - LICENSE
 - README.md
 - Rakefile
@@ -129,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Vagrant ESXi provider plugin