vagrant-vmware-esxi 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8839b6a6c7237f6f1f6b16372942cc64b3e7249e
-  data.tar.gz: 6ed9d6316f258988ae6bb41e456d8549af844be9
+SHA256:
+  metadata.gz: b80dcf0cc3caa8e246414af38314d56ce1d65ace893eba8a4ca20611afb25e2b
+  data.tar.gz: 146dc97e235a67195648198e00b71cd54fa77d5a8860ab7035b5fdb6f236d5f0
 SHA512:
-  metadata.gz: 466b185a31719cb17729bfcd6b54f924a5fcc5262ca3ae1c72a7f7d8650e5c342638fa3a12d700cd9c0769420fb90497949955b931ab7c1b26b24f6d20be1ee4
-  data.tar.gz: afcbe1de25cb5e1d3c4e73b55e2aa99ae9cb0f63a485b1ed9751e26d3cfdfaf8f9eea9a7e72d0cc0fd146bcf0aea982ba87d990e5b93964902e4be8d4400b7ce
+  metadata.gz: 6bc121399632dd6d5c5764f3261bcb2880072497720b97974234884f862123fcd5d8fd567f69fb1dcc8027f3af3bfe643b1d9acb552081d628f9311ecabf8176
+  data.tar.gz: 876ece37a1da0dfdd2109311decd1eae654680991cc879a18dbd991f9a34708f22d8f5bd3f5df64e230bfddcdd657503c5cb4ed675ce5626a13267e793b0f839

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

@@ -11,7 +11,7 @@ Refer to the WIKI for documentation, examples and other information...
 
 Vagrant vs Terraform.
 ---------------------
-If you are using vagrant as a deployment tool (infa 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...
+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
@@ -21,7 +21,7 @@ If you are using vagrant as a deployment tool (infa as code), you may want to co
 
 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.
+* 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.
@@ -34,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.
@@ -48,7 +48,7 @@ Requirements
 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.
@@ -233,11 +233,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,7 +265,7 @@ 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.
 
 
 
@@ -273,9 +273,9 @@ 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 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.
+* 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
@@ -284,13 +284,14 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
-* 2.4.4 Show stderr if unable to connect to esxi host. Update GuestOS types.
+* 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.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.
+* 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.
 
@@ -300,16 +301,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.
@@ -317,22 +318,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-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/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,13 +18,13 @@ 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
@@ -40,7 +41,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 +57,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/version.rb

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.4.4'
+    VERSION = '2.4.5'
     $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.4
+  version: 2.4.5
 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