vagrant-vmware-esxi 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a4b0a4a1d1fb0d75a31e089a5768c08f39e4a97
-  data.tar.gz: f05e33dc43287a63abe340df0129a6fe1bcaf4b3
+  metadata.gz: 594eb32be88981dfc5c975160b86c593020bc751
+  data.tar.gz: '0134082a6cea29094f8ae207b32614e9c1ac0b84'
 SHA512:
-  metadata.gz: d7cc652733e6811873f6fa2d1abc282120adc43fefee116f271ab96890d236d014b2ce9bf89a3b6b886ab69000d4b4f9b38e522f00bf644f9ff5c8659d641efb
-  data.tar.gz: 2c5590cb4815ef1a793f8f1c2e74dbda26d13d635a92f2c96d1b193f84b1a6ca69c71e5043c30fd5334eb772d7ffee1712bba54a33db0ae508364504793f6195
+  metadata.gz: b0065f5d6e9764cb4035d52304d17748a9e8e10f1d929acc96ea66b32f7fe7e39b6e63ba76aadb9eb6a37978df55d89729b370f8c4cc788a9a2efe68dedfd917
+  data.tar.gz: 2de9336efcd152ff7aadfb84ef6f7802a1bfb27c18cddb66937a04faafcdebbb826e33009555cf7dad227a0b5ab2363290c6e4a420ab1fb17038aff6679c1c16

data/README.md

@@ -110,9 +110,9 @@ Vagrant.configure("2") do |config|
     #    Default port 22
     #esxi.esxi_hostport = 22
 
-    #  REQUIRED!  Virtual Network
-    #    You MUST specify a Virtual Network!
-    #    The default is fail if no Virtual Network is set!
+    #  HIGHLY RECOMMENDED!  Virtual Network
+    #    You should specify a Virtual Network!
+    #    The default is to use the first found!
     esxi.virtual_network = "vmnet_example"
 
     #  OPTIONAL.  Specify a Disk Store

data/example_box/Vagrantfile

@@ -64,9 +64,9 @@ Vagrant.configure("2") do |config|
     #    Default port 22
     #esxi.esxi_hostport = 22
 
-    #  REQUIRED!  Virtual Network
-    #    You MUST specify a Virtual Network!
-    #    The default is fail if no Virtual Network is set!
+    #  HIGHLY RECOMMENDED!  Virtual Network
+    #    You should specify a Virtual Network!
+    #    The default is to use the first found!
     esxi.virtual_network = "vmnet_example"
 
     #  OPTIONAL.  Specify a Disk Store

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

@@ -76,10 +76,14 @@ module VagrantPlugins
             #
             #  Figure out DataStore
             r = ssh config.esxi_hostname,
-                    'esxcli storage filesystem list | '\
-                    'grep "/vmfs/volumes/.*true  VMFS" | sort -nk7'
+                    'df | grep "^[VMFS|NFS]" | sort -nk4 |'\
+                    'sed "s|.*/vmfs/volumes/||g" | tail +2'
 
-            availvolumes = r.stdout.dup
+            availvolumes = r.stdout.dup.split(/\n/)
+            if (config.debug =~ %r{true}i) ||
+               (config.debug =~ %r{yes}i)
+               puts "Available DS Volumes: #{availvolumes}"
+            end
             if (r == '') || (r.exit_code != 0)
               raise Errors::ESXiError,
                     message: 'Unable to get list of Disk Stores:'
@@ -92,26 +96,20 @@ module VagrantPlugins
               desired_ds = config.vm_disk_store.to_s
             end
 
-            for line in availvolumes.each_line do
-              if line =~ %r{ #{desired_ds} }
-                guestvm_ds = line.split(' ')[0].to_s
-                guestvm_dsname = line.split(' ')[1]
-                break
-              end
-              guestvm_ds = line.split(' ')[0].to_s
-              guestvm_dsname = line.split(' ')[1]
+            if availvolumes.include? desired_ds
+              guestvm_dsname = desired_ds
+            else
+              guestvm_dsname = availvolumes.last
             end
 
             if (guestvm_dsname != desired_ds) &&
                !config.vm_disk_store.nil?
               env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                   message: 'WARNING       : '\
+                                   message: 'WARNING         : '\
                                             "#{config.vm_disk_store} not "\
-                                            "found, using #{guestvm_dsname}.")
+                                            "found, using #{guestvm_dsname}")
             end
 
-            dst_dir = "#{guestvm_ds}/#{guestvm_vmname}"
-            @logger.info("vagrant-vmware-esxi, createvm: dst_dir: #{dst_dir}")
             @logger.info('vagrant-vmware-esxi, createvm: '\
                          "guestvm_dsname: #{guestvm_dsname}")
 
@@ -122,27 +120,39 @@ module VagrantPlugins
                     'esxcli network vswitch standard list |'\
                     'grep Portgroups | sed "s/^   Portgroups: //g" |'\
                     'sed "s/,.*$//g"'
-            availnetworks = r.stdout.dup
+            availnetworks = r.stdout.dup.split(/\n/)
+            if (config.debug =~ %r{true}i) ||
+               (config.debug =~ %r{yes}i)
+               puts "Available Networks: #{availnetworks}"
+            end
             if (availnetworks == '') || (r.exit_code != 0)
               raise Errors::ESXiError,
                     message: "Unable to get list of Virtual Networks:\n"\
                              "#{r.stderr}"
             end
 
-            guestvm_network = nil
-            availnetworkslist = availnetworks.dup
-            for line in availnetworks.each_line do
-              if line =~ %r{#{config.virtual_network}}
-                guestvm_network = config.virtual_network
-              end
+            if config.virtual_network.nil?
+              guestvm_network = availnetworks.first
+            elsif availnetworks.include? config.virtual_network
+              guestvm_network = config.virtual_network
+            else
+              guestvm_network = availnetworks.first
             end
 
-            if guestvm_network.nil?
-              raise Errors::ESXiConfigError,
-                    message: "You MUST specify a valid virtual network.\n"\
-                             "virtual_network (#{config.virtual_network}).\n"\
-                             "Available Virtual Networks:\n#{availnetworkslist}"
+            if guestvm_network != config.virtual_network
+              if config.virtual_network.nil?
+                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                     message: 'WARNING         : '\
+                                              "config.virtual_network not "\
+                                              "set, using #{availnetworks.first}")
+              else
+                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                     message: 'WARNING         : '\
+                                              "#{config.virtual_network} not "\
+                                              "found, using #{availnetworks.first}")
+              end
             end
+
             @logger.info('vagrant-vmware-esxi, createvm: '\
                          "virtual_network: #{guestvm_network}")
 
@@ -275,6 +285,10 @@ module VagrantPlugins
 
             #  Security bug if unremarked! Password will be exposed in log file.
             #  @logger.info("vagrant-vmware-esxi, createvm: ovf_cmd #{ovf_cmd}")
+            if (config.debug =~ %r{true}i) ||
+               (config.debug =~ %r{yes}i)
+               puts "ovftool command: #{ovf_cmd}"
+            end
             unless system "#{ovf_cmd}"
               raise Errors::OVFToolError, message: ''
             end

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

@@ -20,6 +20,7 @@ module VagrantPlugins
       attr_accessor :numvcpus
       attr_accessor :custom_vmx_settings
       attr_accessor :allow_overwrite
+      attr_accessor :debug
       attr_accessor :system_private_keys_path
       def initialize
         @esxi_hostname = nil
@@ -38,6 +39,7 @@ module VagrantPlugins
         @numvcpus = UNSET_VALUE
         @custom_vmx_settings = UNSET_VALUE
         @allow_overwrite = 'False'
+        @debug = 'False'
         @system_private_keys_path = [
           '~/.ssh/id_rsa',
           '~/.ssh/id_ecdsa',

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

@@ -1,6 +1,6 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-esxi
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Jonathan Senkerik