vagrant-vmware-esxi 2.4.5 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b80dcf0cc3caa8e246414af38314d56ce1d65ace893eba8a4ca20611afb25e2b
-  data.tar.gz: 146dc97e235a67195648198e00b71cd54fa77d5a8860ab7035b5fdb6f236d5f0
+  metadata.gz: 40843e2fa14d0943afe5d7558f522f5838273d9da3dc6d48a872a99b8b04321f
+  data.tar.gz: a98c843764067f2e5f53c3b9e31accd87573844c06ae98e01b29293d92183b25
 SHA512:
-  metadata.gz: 6bc121399632dd6d5c5764f3261bcb2880072497720b97974234884f862123fcd5d8fd567f69fb1dcc8027f3af3bfe643b1d9acb552081d628f9311ecabf8176
-  data.tar.gz: 876ece37a1da0dfdd2109311decd1eae654680991cc879a18dbd991f9a34708f22d8f5bd3f5df64e230bfddcdd657503c5cb4ed675ce5626a13267e793b0f839
+  metadata.gz: a4e0feaa23ce650a034e100538c8935020337f1b977a597b33840e110704b9ba921906897a566bdb657b6e37150da0b067229bb47f3556c5691a1c9ae4e9d9d7
+  data.tar.gz: 348910b7e00ef358d11a9a34d5d788ca2ca3ed6c6bb1b2a0583257e507c333c0de41ab1171fc6d00aa0464d86e5d544fe3fa719789bc7200bbbc009ffa9afb26

data/Gemfile

@@ -15,7 +15,8 @@ source "https://rubygems.org"
 group :development do
   # 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'
+  #gem "vagrant", git: "https://github.com/hashicorp/vagrant.git", :tag => 'v2.2.4'
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git", :tag => 'v2.2.10'
 end
 
 group :plugins do

data/README.md

@@ -3,6 +3,7 @@ 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...  
@@ -18,7 +19,6 @@ If you are using vagrant as a deployment tool (infra as code), you may want to c
 >https://github.com/josenk/vagrant-vmware-esxi
 
 
-
 Features and Compatibility
 --------------------------
 * Clone from VMs.  (see wiki)  Clone a VM on the ESXi host instead of transferring a box stored on your local pc.
@@ -42,6 +42,7 @@ 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...  :-)
@@ -171,7 +172,6 @@ Vagrant.configure('2') do |config|
     #  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'
 
@@ -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 6.7 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']]
 
@@ -282,8 +286,19 @@ Known issues with vmware_esxi
 * Setting the hostname on some boxes can cause 'vagrant up' to fail if the network configuration wasn't previously cleaned up.  Avoid buggy boxes, fix the box networking and repackage, or do not set the hostname via Vagrant.   
 
 
+Donations
+---------
+I work very hard to produce a stable, well documented product.  I appreciate any payments or donations for my efforts.
+* Bitcoin: 12WCUyop3XGiaux8REvmDJ6kWFGoLnM4j9
+* paypal:  josenk at jintegrate.co
+
+
 Version History
 ---------------
+* 2.5.3 Fix, Add hw_versions and GuestOS vmkernel7
+* 2.5.2 Fix, snapshot restore will execute regardless of current state.
+* 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.

data/example_box/Vagrantfile

@@ -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/lib/vagrant-vmware-esxi/action/createvm.rb

@@ -526,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}")
@@ -832,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

@@ -202,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_state.rb

@@ -29,7 +29,11 @@ module VagrantPlugins
               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.

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

@@ -113,8 +113,11 @@ module VagrantPlugins
       def self.action_snapshot_restore
         Vagrant::Action::Builder.new.tap do |b|
           b.use SetESXiPassword
-          b.use Halt
-          b.use Call, WaitForState, :powered_off, 240 do |env1, b1|
+          b.use Call, ReadState do |env1, b1|
+            b1.use Halt unless env1[:machine_state] == 'powered_off'
+            b1.use ReadState
+          end
+          b.use Call, WaitForState, :powered_off, 30 do |env1, b1|
             if env1[:result] == 'True'
               b1.use SnapshotRestore
               b1.use ReadState

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
@@ -93,7 +94,7 @@ module VagrantPlugins
         @debug = 'False'
         @saved_ipaddress = nil
         @supported_guest_virtualhw_versions = [
-          4,7,8,9,10,11,12,13,14
+          4,7,8,9,10,11,12,13,14,15,16,17,18
         ]
         @supported_guest_disk_types = [
           'thin',
@@ -232,6 +233,7 @@ module VagrantPlugins
           'vmkernel5',
           'vmkernel65',
           'vmkernel6',
+          'vmkernel7',
           'vmkernel',
           'vmwarephoton-64',
           'win2000advserv',

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

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

data/vagrant-vmware-esxi.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   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 'i18n', '~> 1.8'
   s.add_runtime_dependency 'log4r', '~> 1.1'
   s.add_runtime_dependency "iniparse", '> 1.0'
   s.add_runtime_dependency 'nokogiri', '~> 1.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.5.3
 platform: ruby
 authors:
 - Jonathan Senkerik
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Vagrant ESXi provider plugin