vagrant-vmware-esxi 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9add93afbe2c65281e14113183ceb33f3d01a51e
-  data.tar.gz: a6a0236f43cc722e4bc656770456ba96b3009b10
+  metadata.gz: 1dcbc0face9e5a7ebbfcfd749b15d83b1f42b2ea
+  data.tar.gz: dddf553b0781d7f60907b6d5c474d8b22778907f
 SHA512:
-  metadata.gz: 0ab75906ccd65e6e791bf52e5368c7fa824a18e02291a1137ccdc5a71e780cbbc196e9dbedd43be7871f5dd7f030cb81c8fb7232784110852fbff4e9a1d86384
-  data.tar.gz: 94187df006a5956a4c4db7bc87742d36461f33c59eee418d42d68de278a14a2f6c1a57787cf42c848549f9bd18a5e6405872362ad071d822f9c9c540bef6308b
+  metadata.gz: 1bd9c80da6a1f44c3cfb70bdca1f35c05d0c5f0caa81d4fbcbbacb55913c087027203b3f6c29f4a282b4a73bb225de467b8a724d4f64c89075873102a8eac3fd
+  data.tar.gz: f9c74b17cc5d35fb3be15c03039a56d793fe611ce477d4f457ba88a659aabf013ff3b2845e30ae5b68b03e0900417c95599584e363088e65bf5669c5f5268de1

data/README.md

@@ -33,7 +33,7 @@ Features and Compatibility
 * 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.
-* Create additional guest storage (upto 14 virtual disks).
+* Create additional guest storage (up to 14 virtual disks).
 * Specify GuestOS types, virtual HW version.
 * Any custom vmx settings can be added or modified.
 
@@ -213,7 +213,7 @@ Vagrant.configure('2') do |config|
     #esxi.guest_guestos = 'centos-64'
 
     #  OPTIONAL. guest_virtualhw_version
-    #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12 & 13.
+    #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12,13 & 14.
     #esxi.guest_virtualhw_version = '9'
 
     #  RISKY. guest_custom_vmx_settings
@@ -235,7 +235,7 @@ Vagrant.configure('2') do |config|
     #esxi.local_failonwarning = 'True'
 
     #  Plugin debug output.
-    #    Please send any bug reports with debug this output...
+    #    Please send any bug reports with this debug output...
     #esxi.debug = 'true'
 
   end
@@ -255,10 +255,11 @@ Basic usage
   * `vagrant ssh-config`
   * `vagrant snapshot push`
   * `vagrant snapshot list`
-  * `vagrant snapshot-info`
+  * `vagrant snapshot-info`   # esxi provided plugin. Output snapshot information/tree.
   * `vagrant snapshot pop`  
   * `vagrant halt`
   * `vagrant provision`
+  * `vagrant address`   # esxi provided plugin. Output IP address of guest.
 
 
 
@@ -272,17 +273,21 @@ 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.
-* Cleanup doesn't always destroy a VM that has been partially built.  To resolve this.  Use the local_allow_overwrite = 'True' option if you want to force a rebuild, or you can delete the vm using the VSphere client.
+* 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 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...
+* 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.
 * 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
-* Setting the hostname on some boxes can cause 'vagrant up' to fail (generic/centos7 for example).  Avoid buggy boxes like generic/centos7, fix the box networking and repackage, or do not set the hostname via Vagrant.   
+* 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.   
 
 
 Version History
 ---------------
+* 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.
+
 * 2.3.2 Fix, vagrant ssh -c now works.
 
 * 2.3.1 Fix, Disk stores can now contain spaces.

data/example_box/Vagrantfile

@@ -216,7 +216,7 @@ Vagrant.configure('2') do |config|
     #    If unspecified, the default will be generated by the OVFTool.  Most
     #    of the time, you don't need to change this unless you are using advanced
     #    custom vmx settings that require it.
-    #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12 & 13.
+    #    ESXi 6.5 supports these versions. 4,7,8,9,10,11,12,13 & 14.
     #esxi.guest_virtualhw_version = '9'
 
     #  RISKY. guest_custom_vmx_settings
@@ -258,7 +258,7 @@ Vagrant.configure('2') do |config|
     #esxi.local_failonwarning = 'True'
 
     #  Plugin debug output.
-    #    Send bug reports with debug output...
+    #    Send bug reports with this debug output...
     #esxi.debug = 'true'
 
   end

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

@@ -78,6 +78,13 @@ module VagrantPlugins
         end
       end
 
+      def self.action_address
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use SetESXiPassword
+          b.use Address
+        end
+      end
+
       def self.action_snapshot_info
         Vagrant::Action::Builder.new.tap do |b|
           b.use SetESXiPassword
@@ -201,6 +208,7 @@ module VagrantPlugins
       autoload :SnapshotDelete, action_root.join('snapshot_delete')
       autoload :SnapshotRestore, action_root.join('snapshot_restore')
       autoload :WaitForState, action_root.join('wait_for_state')
+      autoload :Address, action_root.join('address')
     end
   end
 end

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

@@ -0,0 +1,38 @@
+require 'log4r'
+require 'net/ssh'
+
+module VagrantPlugins
+  module ESXi
+    module Action
+      # This action will print the IP address
+      class Address
+        def initialize(app, _env)
+          @app    = app
+          @logger = Log4r::Logger.new('vagrant_vmware_esxi::action::address')
+        end
+
+        def call(env)
+          address(env)
+          @app.call(env)
+        end
+
+        def address(env)
+          @logger.info('vagrant-vmware-esxi, address: start...')
+
+          # Get config.
+          machine = env[:machine]
+          config = env[:machine].provider_config
+
+          # return IP if it's known.
+          return nil if machine.state.id != :running
+
+          ssh_info = machine.ssh_info
+          return nil if !ssh_info
+
+          env[:ui].info ssh_info[:host]
+
+        end
+      end
+    end
+  end
+end

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

@@ -14,11 +14,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          suspend(env)
+          package(env)
           @app.call(env)
         end
 
-        def suspend(env)
+        def package(env)
           @logger.info('vagrant-vmware-esxi, package: start...')
 
           # Get config.

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

@@ -58,7 +58,7 @@ module VagrantPlugins
               #    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 << '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])"'
               r = ssh.exec!(ssh_execute_cmd)
               ipaddress = r.strip
 

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

@@ -12,11 +12,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          suspend(env)
+          snapshotdelete(env)
           @app.call(env)
         end
 
-        def suspend(env)
+        def snapshotdelete(env)
           @logger.info('vagrant-vmware-esxi, snapshot_delete: start...')
 
           # Get config.

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

@@ -12,11 +12,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          suspend(env)
+          snapshotinfo(env)
           @app.call(env)
         end
 
-        def suspend(env)
+        def snapshotinfo(env)
           @logger.info('vagrant-vmware-esxi, snapshot_info: start...')
 
           # Get config.
@@ -26,9 +26,9 @@ module VagrantPlugins
           @logger.info("vagrant-vmware-esxi, snapshot_info: machine id: #{machine.id}")
           @logger.info("vagrant-vmware-esxi, snapshot_info: current state: #{env[:machine_state]}")
 
-          if env[:machine_state].to_s == 'not_created'
+          if machine.id == ''
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                 message: 'Cannot snapshot_info in this state')
+                                 message: 'Cannot snapshot-info in this state')
           else
 
             Net::SSH.start(config.esxi_hostname, config.esxi_username,
@@ -43,9 +43,9 @@ module VagrantPlugins
               r = ssh.exec!(
                   "vim-cmd vmsvc/snapshot.get #{machine.id} 2>&1 | "\
                   "sed 's/Get Snapshot:/ /g' | "\
-                  "grep -v "\
+                  "grep -v -e '^  $' "\
                   "-e 'Snapshot Id ' "\
-                  "-e 'Snapshot Desciption ' "\
+                  "-e 'Snapshot Created On ' "\
                   "-e 'Snapshot State '")
 
               snapshotinfo = r

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

@@ -12,11 +12,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          suspend(env)
+          snapshotlist(env)
           @app.call(env)
         end
 
-        def suspend(env)
+        def snapshotlist(env)
           @logger.info('vagrant-vmware-esxi, snapshot_list: start...')
 
           # Get config.

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

@@ -12,11 +12,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          suspend(env)
+          snapshotrestore(env)
           @app.call(env)
         end
 
-        def suspend(env)
+        def snapshotrestore(env)
           @logger.info('vagrant-vmware-esxi, snapshot_restore: start...')
 
           # Get config.

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

@@ -12,11 +12,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          suspend(env)
+          snapshotsave(env)
           @app.call(env)
         end
 
-        def suspend(env)
+        def snapshotsave(env)
           @logger.info('vagrant-vmware-esxi, snapshot_save: start...')
 
           # Get config.

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

@@ -30,10 +30,16 @@ module VagrantPlugins
                 env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                      message: "Success, state is now \"#{@state}\"")
               end
+
             rescue Timeout::Error
-              env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                   message: "Failed, timeout waiting for \"#{@state}\"")
-              env[:result] = 'False' # couldn't reach state in time
+              if @state.to_s == 'running'
+                raise Errors::GeneralError,
+                      message: 'Failed, timeout waiting for "running".'
+              else
+                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                     message: "Timeout waiting for \"#{@state}\"")
+                env[:result] = 'False' # couldn't reach state in time
+              end
             end
           end
           env[:machine].provider_config.saved_ipaddress = nil

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

@@ -1,14 +1,28 @@
 module VagrantPlugins
   module ESXi
+
     class SnapshotInfo < Vagrant.plugin(2, :command)
       def self.synopsis
           "Snapshot additional information."
-        end
+      end
       def execute
         with_target_vms(nil, :provider => "vmware_esxi") do |vm|
           vm.action(:snapshot_info)
         end
       end
     end
+
+    class CapAddress < Vagrant.plugin(2, :command)
+      def self.synopsis
+          "outputs the IP address of a guest."
+      end
+      def execute
+        with_target_vms(nil, :provider => "vmware_esxi") do |vm|
+          vm.action(:address)
+        end
+      end
+    end
+
+
   end
 end

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

@@ -93,7 +93,7 @@ module VagrantPlugins
         @debug = 'False'
         @saved_ipaddress = nil
         @supported_guest_virtualhw_versions = [
-          4,7,8,9,10,11,12,13
+          4,7,8,9,10,11,12,13,14
         ]
         @supported_guest_disk_types = [
           'thin',

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

@@ -22,6 +22,12 @@ module VagrantPlugins
         Provider
       end
 
+      #  Prints the IP address of the guest
+      command('address') do
+        require_relative 'command'
+        CapAddress
+      end
+
       provider_capability('vmware_esxi', 'snapshot_list') do
         require_relative 'cap/snapshot_list'
         Cap::SnapshotList

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

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.3.2'
+    VERSION = '2.4.0'
     $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-07-03'
+  s.date            = '2018-07-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.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Jonathan Senkerik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -82,6 +82,7 @@ files:
 - example_box/metadata.json
 - lib/vagrant-vmware-esxi.rb
 - lib/vagrant-vmware-esxi/action.rb
+- lib/vagrant-vmware-esxi/action/address.rb
 - lib/vagrant-vmware-esxi/action/boot.rb
 - lib/vagrant-vmware-esxi/action/createvm.rb
 - lib/vagrant-vmware-esxi/action/destroy.rb