vagrant-vmware-esxi 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c2145e05970afe201403ae42692fd057e282d5
-  data.tar.gz: 5eb2e6c0f233ebd61e73c2208c0635b641f520b5
+  metadata.gz: a4741f102e0fc5afd6b6d0ee886f6b5d863b49e4
+  data.tar.gz: 8f3519566a7ba2c5381823f9e4b9a0def26415e9
 SHA512:
-  metadata.gz: 3eb8c8b5d115abedc55d518b42f11a85eba4614b5df7d5b524e21037b4f8ac0fb95887a9ac9b62ac3974ae43d6ccfad380462f831fb6e62b2b391e834995b22c
-  data.tar.gz: cf88a86b99ff57ec19d70f686a2b9b529f474d18c42ac971b46d4bff99b4875783cb54eab273e2de5e6852b89e4cb506c7011f7670fa34e6d414a6a8ccc8a745
+  metadata.gz: e0e41dfa63d8f38cec8598bed5afddbd13d8baeb78051dedc0d644365539b9a57ba5ea53d16795a7dfb3dc59f73a1deb546524170a42c2cd9f74636018c61cea
+  data.tar.gz: f84886ad62eb6a7bb93817722081fa2bdd32550a6c6ed5ed52c85835613440f6d63394ac373ddb6cd6e8e292e4c432c10ad62184cc51119a675e3ae32299b11a

data/README.md

@@ -12,7 +12,7 @@ Refer to the WIKI for documentation, examples and other information...
 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.
+>https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm
 
 Features and Compatibility
 --------------------------
@@ -95,8 +95,9 @@ Vagrant.configure('2') do |config|
   #config.vm.box = 'puphpet/debian75-x64'
 
 
-  #  Use rsync and NFS synced folders. (or disable them)
-  config.vm.synced_folder('.', '/vagrant', type: 'rsync')
+  #  Use rsync and NFS synced folders. (or use the option to disable them)
+  #    https://www.vagrantup.com/docs/synced-folders/
+  #config.vm.synced_folder('.', '/vagrant', type: 'rsync')
   config.vm.synced_folder('.', '/vagrant', type: 'nfs', disabled: true)
 
   #  Vagrant can configure additional network interfaces using a static IP or
@@ -154,7 +155,7 @@ Vagrant.configure('2') do |config|
     #    Vagrant can use any stopped VM as the source 'box'.   The VM must be
     #    registered, stopped and must have the vagrant insecure ssh key installed.
     #    If the VM is stored in a resource pool, it must be specified.
-    #    See wiki: https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm.
+    #    See wiki: https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm
     #esxi.clone_from_vm = 'resource_pool/source_vm'
 
     #  OPTIONAL.  Guest VM name to use.
@@ -276,6 +277,8 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 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.

data/example_box/Vagrantfile

@@ -27,7 +27,8 @@ Vagrant.configure('2') do |config|
 
 
   #  Use rsync and NFS synced folders. (or disable them)
-  config.vm.synced_folder('.', '/vagrant', type: 'rsync')
+  #    https://www.vagrantup.com/docs/synced-folders/
+  #config.vm.synced_folder('.', '/vagrant', type: 'rsync')
   config.vm.synced_folder('.', '/vagrant', type: 'nfs', disabled: true)
 
   #  Vagrant can set a static IP for the additional network interfaces.  Use
@@ -110,8 +111,8 @@ Vagrant.configure('2') do |config|
     #    IP addresses.  This specifies which 'ESXi virtual network' is used for
     #    each network interface in your VM.  For most OS's DHCP is the default,
     #    so, you will need a DHCP server for each virtual network.  To set a
-    #    static IP, see above 'config.vm.network'.
-    #esxi.esxi_virtual_network = ['vmnet1','vmnet2','vmnet3','vmnet4']
+    #    static IP for interface 2, 3 or 4. see above 'config.vm.network'.
+    #esxi.esxi_virtual_network = ['VM Network','VM Network2','VM Network3','VM Network4']
 
     #  OPTIONAL.  Specify a Disk Store
     #    If it's not specified, the Default is to use the least used Disk Store.
@@ -123,7 +124,7 @@ Vagrant.configure('2') do |config|
     #    from other systems on your esxi host.  The resource pool must
     #    already exist and have the proper permissions set.
     #
-    #     Vagrant will NOT create a Resource pool it for you.
+    #     This plugin will NOT create a Resource pool for you!
     #esxi.esxi_resource_pool = '/Vagrant'
 
     #  Optional. Specify a VM to clone instead of uploading a box.
@@ -131,7 +132,7 @@ Vagrant.configure('2') do |config|
     #    registered, stopped and must have the vagrant insecure ssh key installed.
     #    If the VM is stored in a resource pool, it must be specified.  If this
     #    option is specified, config.vm.box should be set to a dummy box.
-    #    See wiki: https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm.
+    #    See wiki: https://github.com/josenk/vagrant-vmware-esxi/wiki/How-to-clone_from_vm
     #esxi.clone_from_vm = 'resource_pool/source_vm'
 
     #  OPTIONAL.  Guest VM name to use.
@@ -207,7 +208,7 @@ Vagrant.configure('2') do |config|
     #    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 guest_guestos
     #    types for ESXI.
-    #    https://github.com/josenk/vagrant-vmware-esxi/ESXi_guest_guestos_types.md
+    #    https://github.com/josenk/vagrant-vmware-esxi/blob/master/ESXi_guestos_types.md
     #esxi.guest_guestos = 'centos-64'
 
     #  OPTIONAL. guest_virtualhw_version

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

@@ -32,6 +32,7 @@ module VagrantPlugins
               #
               #  Prompt for password
               #
+              password_type = 'prompt'
               begin
                 print "#{config.esxi_username}@#{config.esxi_hostname} password:"
                 config.esxi_password = STDIN.noecho(&:gets).chomp
@@ -57,6 +58,7 @@ module VagrantPlugins
               #
               #  Get pw from environment variable
               #
+              password_type = 'env'
               esxi_password_env = config.esxi_password.gsub(/env:/i, '').chomp
               if esxi_password_env.length < 1
                 esxi_password_env = 'esxi_password'
@@ -72,6 +74,7 @@ module VagrantPlugins
               #
               #  Get password from file
               #
+              password_type = 'file'
               esxi_password_file = config.esxi_password.gsub(/file:/i, '').chomp
               if esxi_password_file.empty?
                 esxi_password_file = '~/.esxi_password'
@@ -95,6 +98,7 @@ module VagrantPlugins
               #
               #  use ssh keys
               #
+              password_type = 'key'
               esxi_password_key = config.esxi_password.gsub(/key:/i, '').chomp
               config.esxi_password = ''
               unless esxi_password_key.empty?
@@ -102,6 +106,7 @@ module VagrantPlugins
               end
             else
               # Use plain text password from config
+              password_type = 'plain'
             end
 
             #
@@ -177,16 +182,16 @@ module VagrantPlugins
                 end
               end
             rescue
-              if config.esxi_password =~ %r{^prompt:}i
-                access_error_message = 'Prompt for password'
-              elsif config.esxi_password =~ %r{^env:}i
-                access_error_message = "env:#{esxi_password_env}"
-              elsif config.esxi_password =~ %r{^file:}i
-                access_error_message = "file:#{esxi_password_file}"
-              elsif config.esxi_password =~ %r{^key:}i
-                access_error_message = "key:#{config.local_private_keys}"
+              if password_type == 'prompt'
+                access_error_message = 'Password incorrect.'
+              elsif password_type == 'env'
+                access_error_message = "Verify env:#{esxi_password_env}"
+              elsif password_type == 'file'
+                access_error_message = "Verify file:#{esxi_password_file}"
+              elsif password_type == 'key'
+                access_error_message = "Verify key:#{config.local_private_keys}"
               else
-                access_error_message = 'password in Vagrantfile'
+                access_error_message = 'Verify password in Vagrantfile is correct.'
               end
 
               env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',

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

@@ -63,7 +63,7 @@ module VagrantPlugins
         @esxi_hostname = nil
         @esxi_hostport = 22
         @esxi_username = 'root'
-        @esxi_password = nil
+        @esxi_password = ''
         @encoded_esxi_password = nil
         @esxi_disk_store = nil
         @esxi_virtual_network = nil

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

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.2.1'
+    VERSION = '2.2.2'
     $vagrant_vmware_esxi_version = VERSION
   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-04-23'
+  s.date            = '2018-05-09'
   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: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Jonathan Senkerik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n