vagrant-vmware-esxi 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5335d542dafabd92713684c827886ac3c203f856
-  data.tar.gz: 4d13033de5ad8d8295e6e0f733d3d1523fe89d22
+  metadata.gz: 60c2145e05970afe201403ae42692fd057e282d5
+  data.tar.gz: 5eb2e6c0f233ebd61e73c2208c0635b641f520b5
 SHA512:
-  metadata.gz: 36030dddf5555de12bf60b7fd2b8af9bae47b4cfca5616af885db87b1f07e2256c01e112fc98fe6e6086feecfbed5c9dcc2923f15b64f7a929a2991e7d47097b
-  data.tar.gz: b148ae7cb8066bddd881bb053cf869510961dd6aa54e5b57f9e867697ee74101712efbbfbf57773a18166739196244ccee028ee6dae5f07d731ae4f77b51df42
+  metadata.gz: 3eb8c8b5d115abedc55d518b42f11a85eba4614b5df7d5b524e21037b4f8ac0fb95887a9ac9b62ac3974ae43d6ccfad380462f831fb6e62b2b391e834995b22c
+  data.tar.gz: cf88a86b99ff57ec19d70f686a2b9b529f474d18c42ac971b46d4bff99b4875783cb54eab273e2de5e6852b89e4cb506c7011f7670fa34e6d414a6a8ccc8a745

data/README.md

@@ -271,13 +271,18 @@ Known issues with vmware_esxi
 * Vagrant NFS synced folders is not 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, etc...
 * 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.
 * Cygwin & gitbash have console issues. Ruby module io/console does not have support.  https://github.com/ruby/io-console/issues/2
+* Setting the hostname might fail on some boxes.  Use most recent version of Vagrant for best results.   
 
 
 Version History
 ---------------
+* 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.
+
 * 2.2.0 Add support to extend boot disk size.
         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.
 

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

@@ -35,7 +35,7 @@ module VagrantPlugins
                                  message: 'Cannot boot in this state')
           else
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -42,10 +42,7 @@ module VagrantPlugins
           end
 
           # Set desired_guest_name
-          if !env[:machine].config.vm.hostname.nil?
-            # A hostname has been set, so use it.
-            desired_guest_name = env[:machine].config.vm.hostname.dup
-          elsif config.guest_name.nil?
+          if env[:machine].config.vm.hostname.nil? && config.guest_name.nil?
             #  Nothing set, so generate our own
             desired_guest_name = config.guest_name_prefix.strip
             desired_guest_name << `hostname`.partition('.').first.strip
@@ -54,9 +51,10 @@ module VagrantPlugins
             desired_guest_name << '-'
             base = File.basename machine.env.cwd.to_s
             desired_guest_name << base
-            config.guest_name = desired_guest_name
+          elsif !env[:machine].config.vm.hostname.nil? && config.guest_name.nil?
+            desired_guest_name = env[:machine].config.vm.hostname.dup
           else
-            # A guest_name has been set, so use it.
+            # Both are set, or only guest_name. So, we'll choose guest_name.
             desired_guest_name = config.guest_name.strip
           end
           desired_guest_name = desired_guest_name[0..252].gsub(/_/,'-').gsub(/[^0-9A-Za-z\-\.]/i, '').strip
@@ -77,11 +75,26 @@ module VagrantPlugins
               raise Errors::GeneralError,
                     message: "Unable to create tmp dir #{tmpdir}"
             end
+
+            ovf_debug = '--X:logLevel=info --X:logToConsole' if config.debug =~ %r{ovftool}i
             #
             #  Source from Clone
-            clone_from_vm_path = "vi://#{config.esxi_username}:#{$encoded_esxi_password}@#{config.esxi_hostname}/#{config.clone_from_vm}"
-            ovf_cmd = "ovftool --noSSLVerify --overwrite --powerOffTarget --noDisks --targetType=vmx "\
-                  "#{clone_from_vm_path} #{tmpdir}"
+            clone_from_vm_path = "vi://#{config.esxi_username}:#{config.encoded_esxi_password}@#{config.esxi_hostname}/#{config.clone_from_vm}"
+            ovf_cmd = "ovftool --noSSLVerify --overwrite --X:useMacNaming=false "\
+                      "--powerOffTarget --noDisks --targetType=vmx #{ovf_debug} "\
+                      "#{clone_from_vm_path} #{tmpdir}"
+            if config.debug =~ %r{password}i
+              @logger.info("vagrant-vmware-esxi, createvm: ovf_cmd #{ovf_cmd}")
+              puts "ovftool command: #{ovf_cmd}"
+            elsif config.debug =~ %r{true}i
+              if config.encoded_esxi_password == ''
+                ovf_cmd_nopw = ovf_cmd
+              else
+                ovf_cmd_nopw = ovf_cmd.gsub(/#{config.encoded_esxi_password}/, '******')
+              end
+              puts "ovftool command: #{ovf_cmd_nopw}"
+            end
+
             unless system "#{ovf_cmd}"
               raise Errors::OVFToolError,
                     message: "Unable to access #{config.clone_from_vm}"
@@ -99,7 +112,7 @@ module VagrantPlugins
           #  Open the network connection
           #
           Net::SSH.start( config.esxi_hostname, config.esxi_username,
-            password:                   $esxi_password,
+            password:                   config.esxi_password,
             port:                       config.esxi_hostport,
             keys:                       config.local_private_keys,
             timeout:                    20,
@@ -491,11 +504,11 @@ module VagrantPlugins
           else
             src_path = clone_from_vm_path
           end
-          ovf_cmd = "ovftool --noSSLVerify #{overwrite_opts} "\
+          ovf_cmd = "ovftool --noSSLVerify #{overwrite_opts} #{ovf_debug} "\
                 "-dm=#{guest_disk_type} #{local_laxoption} "\
                 "-ds=\"#{@guestvm_dsname}\" --name=\"#{desired_guest_name}\" "\
                 "\"#{src_path}\" vi://#{config.esxi_username}:"\
-                "#{$encoded_esxi_password}@#{config.esxi_hostname}"\
+                "#{config.encoded_esxi_password}@#{config.esxi_hostname}"\
                 "#{esxi_resource_pool}"
 
           #
@@ -505,10 +518,10 @@ module VagrantPlugins
             @logger.info("vagrant-vmware-esxi, createvm: ovf_cmd #{ovf_cmd}")
             puts "ovftool command: #{ovf_cmd}"
           elsif config.debug =~ %r{true}i
-            if $encoded_esxi_password == ''
+            if config.encoded_esxi_password == ''
               ovf_cmd_nopw = ovf_cmd
             else
-              ovf_cmd_nopw = ovf_cmd.gsub(/#{$encoded_esxi_password}/, '******')
+              ovf_cmd_nopw = ovf_cmd.gsub(/#{config.encoded_esxi_password}/, '******')
             end
             puts "ovftool command: #{ovf_cmd_nopw}"
           end
@@ -530,7 +543,7 @@ module VagrantPlugins
           #  to vmx file.
           #
           Net::SSH.start(config.esxi_hostname, config.esxi_username,
-            password:                   $esxi_password,
+            password:                   config.esxi_password,
             port:                       config.esxi_hostport,
             keys:                       config.local_private_keys,
             timeout:                    20,

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

@@ -34,7 +34,7 @@ module VagrantPlugins
                   message: 'Guest VM should have been powered off...'
           else
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -25,16 +25,16 @@ module VagrantPlugins
           config = env[:machine].provider_config
 
           #
-          #  Set global variable $esxi_password
+          #  Set global variable config.esxi_password
           #
-          if $esxi_password.nil?
+          if config.encoded_esxi_password.nil?
             if config.esxi_password =~ %r{^prompt:}i
               #
               #  Prompt for password
               #
               begin
                 print "#{config.esxi_username}@#{config.esxi_hostname} password:"
-                $esxi_password = STDIN.noecho(&:gets).chomp
+                config.esxi_password = STDIN.noecho(&:gets).chomp
                 puts ''
               rescue
                 begin
@@ -46,7 +46,7 @@ module VagrantPlugins
                   puts 'is a problem for you, ctrl-C / [ENTER] to exit and fix your stdin.'
                   puts ''
                   print "#{config.esxi_username}@#{config.esxi_hostname} password:"
-                  $esxi_password = $stdin.readline().chomp
+                  config.esxi_password = $stdin.readline().chomp
                   puts ''
                 rescue
                   raise Errors::ESXiError,
@@ -63,7 +63,7 @@ module VagrantPlugins
               end
               begin
                 stdin_pw = ENV[esxi_password_env]
-                $esxi_password = stdin_pw.chomp
+                config.esxi_password = stdin_pw.chomp
               rescue
                 raise Errors::ESXiError,
                       message: "Unable to read environment variable: #{esxi_password_env}"
@@ -84,7 +84,7 @@ module VagrantPlugins
                   fh = File.open(File.expand_path(esxi_password_file))
                   file_pw = fh.readline
                   fh.close
-                  $esxi_password = file_pw.chomp
+                  config.esxi_password = file_pw.chomp
                 else
                   raise Errors::ESXiError, message: "Unable to open #{esxi_password_file}"
                 end
@@ -95,20 +95,19 @@ module VagrantPlugins
               #
               #  use ssh keys
               #
-              $esxi_password = ''
               esxi_password_key = config.esxi_password.gsub(/key:/i, '').chomp
+              config.esxi_password = ''
               unless esxi_password_key.empty?
                 config.local_private_keys = esxi_password_key
               end
             else
               # Use plain text password from config
-              $esxi_password = config.esxi_password
             end
 
             #
             #  Encode special characters in PW
             #
-            $encoded_esxi_password = $esxi_password.gsub('%', '%25').\
+            config.encoded_esxi_password = config.esxi_password.gsub('%', '%25').\
               gsub(' ', '%20').\
               gsub('!', '%21').\
               gsub('"', '%22').\
@@ -140,7 +139,7 @@ module VagrantPlugins
               gsub('{', '%7b').\
               gsub('|', '%7c').\
               gsub('}', '%7d').\
-              gsub('~', '%7e')      
+              gsub('~', '%7e')
 
             @logger.info('vagrant-vmware-esxi, connect_esxi: local_private_keys: '\
                          "#{config.local_private_keys}")
@@ -151,9 +150,9 @@ module VagrantPlugins
             begin
               puts "RUBY_PLATFORM: #{RUBY_PLATFORM}" if config.debug =~ %r{true}i
               puts "Testing esxi connectivity" if config.debug =~ %r{ip}i
-              puts "esxi_ssh_keys: #{config.local_private_keys}" if config.debug =~ %r{ip}i
+              puts "esxi_ssh_keys: #{config.local_private_keys}" if config.debug =~ %r{password}i
               Net::SSH.start(config.esxi_hostname, config.esxi_username,
-                password:                   $esxi_password,
+                password:                   config.esxi_password,
                 port:                       config.esxi_hostport,
                 keys:                       config.local_private_keys,
                 timeout:                    20,

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

@@ -29,7 +29,7 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.already_destroyed')
           else
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -94,7 +94,7 @@ module VagrantPlugins
 
             ovf_cmd = "ovftool --noSSLVerify -tt=VMX --name=\"#{boxname}\" "\
                       "#{overwrite_opts} vi://#{config.esxi_username}:"\
-                      "#{$encoded_esxi_password}@#{config.esxi_hostname}"\
+                      "#{config.encoded_esxi_password}@#{config.esxi_hostname}"\
                       "?moref=vim.VirtualMachine:#{machine.id} #{tmpdir}"
 
             unless system "#{ovf_cmd}"

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

@@ -42,7 +42,7 @@ module VagrantPlugins
 
             #  Figure out vm_ipaddress
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -77,7 +77,7 @@ module VagrantPlugins
           @logger.info("vagrant-vmware-esxi, read_state: current state: #{env[:machine_state]}")
 
           Net::SSH.start(config.esxi_hostname, config.esxi_username,
-            password:                   $esxi_password,
+            password:                   config.esxi_password,
             port:                       config.esxi_hostport,
             keys:                       config.local_private_keys,
             timeout:                    20,

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

@@ -39,7 +39,7 @@ module VagrantPlugins
 
             #
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -31,7 +31,7 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "Starting graceful shutdown...")
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -35,7 +35,7 @@ module VagrantPlugins
 
             #
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -32,7 +32,7 @@ module VagrantPlugins
           else
 
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -32,7 +32,7 @@ module VagrantPlugins
           else
 
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -35,7 +35,7 @@ module VagrantPlugins
 
             #
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -36,7 +36,7 @@ module VagrantPlugins
 
             #
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -38,7 +38,7 @@ module VagrantPlugins
 
             #
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
-              password:                   $esxi_password,
+              password:                   config.esxi_password,
               port:                       config.esxi_hostport,
               keys:                       config.local_private_keys,
               timeout:                    20,

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

@@ -160,7 +160,7 @@ module VagrantPlugins
               b1.use Provision
               b1.use SyncedFolderCleanup
               b1.use SyncedFolders
-              #b1.use SetHostname   # Still too buggy.  Tested with vagrant 2.0.4dev
+              b1.use SetHostname
             end
           end
         end

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

@@ -8,6 +8,7 @@ module VagrantPlugins
       attr_accessor :esxi_hostport
       attr_accessor :esxi_username
       attr_accessor :esxi_password
+      attr_accessor :encoded_esxi_password
       attr_accessor :esxi_disk_store
       attr_accessor :esxi_virtual_network
       attr_accessor :esxi_resource_pool
@@ -31,14 +32,12 @@ module VagrantPlugins
       attr_accessor :local_allow_overwrite
       attr_accessor :local_lax
       attr_accessor :local_use_ip_cache
-      attr_accessor :local_private_keys_path
       attr_accessor :debug
       attr_accessor :supported_guest_virtualhw_versions
       attr_accessor :supported_guest_disk_types
       attr_accessor :supported_guest_nic_types
       attr_accessor :supported_guest_guestos
       attr_accessor :saved_ipaddress
-      attr_accessor :saved_ipaddress_count
 
       #
       #  legacy (1.x) config entries
@@ -65,6 +64,7 @@ module VagrantPlugins
         @esxi_hostport = 22
         @esxi_username = 'root'
         @esxi_password = nil
+        @encoded_esxi_password = nil
         @esxi_disk_store = nil
         @esxi_virtual_network = nil
         @esxi_resource_pool = nil
@@ -90,15 +90,6 @@ module VagrantPlugins
         @local_use_ip_cache = 'True'
         @debug = 'False'
         @saved_ipaddress = nil
-        @saved_ipaddress_count = 0
-        @system_private_keys = [
-          '~/.ssh/id_rsa',
-          '~/.ssh/id_ecdsa',
-          '~/.ssh/id_dsa'
-        ]
-        #'~/.ssh/id_ed25519',
-        # Removed support for ed25519 because libsodium is not compatible with windows.
-        # Should be added back when net-ssh 5.0 is out of beta.
         @supported_guest_virtualhw_versions = [
           4,7,8,9,10,11,12,13
         ]
@@ -365,6 +356,7 @@ module VagrantPlugins
         end
 
         @guest_username = nil if @guest_username == UNSET_VALUE
+        @encoded_esxi_password = nil
 
         @guest_boot_disk_size = @guest_boot_disk_size.to_i if @guest_boot_disk_size.is_a? String
         @guest_boot_disk_size = nil if @guest_boot_disk_size == 0
@@ -375,8 +367,14 @@ module VagrantPlugins
 
         @esxi_virtual_network = ['--NotSet--'] if @esxi_virtual_network.nil?
 
-        @local_private_keys = @system_private_keys if @local_private_keys == nil
-
+        @local_private_keys = [
+          '~/.ssh/id_rsa',
+          '~/.ssh/id_ecdsa',
+          '~/.ssh/id_dsa'
+        ]
+        #'~/.ssh/id_ed25519',
+        # Removed support for ed25519 because libsodium is not compatible with windows.
+        # Should be added back when net-ssh 5.0 is out of beta.
 
         if @local_lax =~ /true/i
           @local_lax = 'True'
@@ -400,6 +398,7 @@ module VagrantPlugins
        else
          @guest_snapshot_quiesced = ''
        end
+       @saved_ipaddress = nil
 
       end
     end

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

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