vagrant-vmware-esxi 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fd559e963813bd56e7f2dedf83924abbe16706
-  data.tar.gz: 56447256f57346e7f1b3da2de4da83d0a529c237
+  metadata.gz: 5335d542dafabd92713684c827886ac3c203f856
+  data.tar.gz: 4d13033de5ad8d8295e6e0f733d3d1523fe89d22
 SHA512:
-  metadata.gz: 00200e42bb32d12799a69d1f50a79c9345078c4d84875017ad7c8d1cef46e168296d1ba06aab9720fc5b0e66bc9086b739ac9e938d291bfedaa54a20c44eff2e
-  data.tar.gz: 043e6563f627a24a820f4963eff2e225ff082063db94f7bddbb8d25ec87e2d57449c9368140c16ecd2e4205e8d665931ab5122567126c9486d4bdf6e72a27d20
+  metadata.gz: 36030dddf5555de12bf60b7fd2b8af9bae47b4cfca5616af885db87b1f07e2256c01e112fc98fe6e6086feecfbed5c9dcc2923f15b64f7a929a2991e7d47097b
+  data.tar.gz: b148ae7cb8066bddd881bb053cf869510961dd6aa54e5b57f9e867697ee74101712efbbfbf57773a18166739196244ccee028ee6dae5f07d731ae4f77b51df42

data/README.md

@@ -190,6 +190,13 @@ Vagrant.configure('2') do |config|
     #    'thin', 'thick', or 'eagerzeroedthick'
     #esxi.guest_disk_type = 'thick'
 
+    #  OPTIONAL. Boot disk size.
+    #    If unspecified, the boot disk size will be the same as the original
+    #    box.  You can specify a larger boot disk size in GB.  The extra disk space
+    #    will NOT automatically be available to your OS.  You will need to
+    #    create or modify partitions, LVM and/or filesystems.
+    #esxi.guest_boot_disk_size = 50
+
     #  OPTIONAL.  Create additional storage for guests.
     #    You can specify an array of up to 13 virtual disk sizes (in GB) that you
     #    would like the provider to create once the guest has been created.
@@ -268,6 +275,9 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 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/example_box/Vagrantfile

@@ -161,6 +161,14 @@ Vagrant.configure('2') do |config|
     #    'thin', 'thick', or 'eagerzeroedthick'
     #esxi.guest_disk_type = 'thick'
 
+    #  OPTIONAL. Boot disk size.
+    #    If unspecified, the boot disk size will be the same as the original
+    #    box.  You can specify a larger boot disk size in GB.  The extra disk space
+    #    will NOT automatically be available to your OS.  You will need to
+    #    create or modify partitions, LVM and/or filesystems.  NOTE:  This will
+    #    extend only, no shrinking.
+    #esxi.guest_boot_disk_size = 50
+
     #  OPTIONAL.  Create additional storage for guests.
     #    You can specify an array of upto 14 virtual disk sizes (in GB) that you
     #    would like the provider to create once the guest has been created.  The

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

@@ -78,7 +78,7 @@ module VagrantPlugins
                     message: "Unable to create tmp dir #{tmpdir}"
             end
             #
-            #  Source from Clone Source
+            #  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}"
@@ -220,9 +220,7 @@ module VagrantPlugins
                                               "found, using #{availnetworks.first}")
               end
               networkID += 1
-              if networkID >= 4
-                break
-              end
+              break if networkID >= 4
             end
           end
 
@@ -322,7 +320,7 @@ module VagrantPlugins
 
           end
 
-          #  finalize vmx.
+          #  Some vmx didn't have this set???
           unless new_vmx_contents =~ %r{^numvcpus =}i
             new_vmx_contents << "numvcpus = \"#{desired_guest_numvcpus}\"\n"
           end
@@ -463,6 +461,10 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "Disk Type       : #{guest_disk_type}")
           end
+          unless config.guest_boot_disk_size.nil?
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Boot Disk Size  : #{config.guest_boot_disk_size}GB")
+          end
           unless config.guest_storage.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "Storage (GB)    : #{config.guest_storage[0..13]}")
@@ -549,8 +551,6 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: "VMID            : #{env[:machine].id}")
 
-            #
-            #   -=-=-=-=-=-=-
             #  Destination (on esxi host) vmx file
             dst_vmx = ssh.exec!("vim-cmd vmsvc/get.config #{env[:machine].id} |\
                     grep vmPathName|awk '{print $NF}'|sed 's/[\"|,]//g'")
@@ -567,6 +567,29 @@ module VagrantPlugins
             esxi_guest_dir = dst_vmx_file + dst_vmx_dir.strip
             dst_vmx_file << dst_vmx
 
+            #  Extend boot disk if required
+            if config.guest_boot_disk_size.is_a? Integer
+              boot_disk = ssh.exec!("vim-cmd vmsvc/device.getdevices #{env[:machine].id} |"\
+                                     'grep -A10 "key = 2000"|grep fileName|head -1|grep -o "\/.*.vmdk"')
+
+              puts "Boot Disk: #{boot_disk}" if config.debug =~ %r{true}i
+
+              if boot_disk.exitstatus != 0
+                raise Errors::ESXiError,
+                      message: "Unable to determin boot disk"
+              end
+              cmd = "/bin/vmkfstools -X #{config.guest_boot_disk_size}G \"#{esxi_guest_dir}#{boot_disk.strip}\""
+              puts "cmd: #{cmd}" if config.debug =~ %r{true}i
+              r = ssh.exec!(cmd)
+              if r.exitstatus != 0
+                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                     message: "WARNING         : Unable to extend Boot Disk to #{config.guest_boot_disk_size}GB")
+              else
+                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                     message: "Extend Boot dsk : #{config.guest_boot_disk_size}GB")
+              end
+            end
+
             #  Create storage if required
             if config.guest_storage.is_a? Array
               index = -1
@@ -582,13 +605,11 @@ module VagrantPlugins
                 else
                   env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                        message: "Creating Storage: disk_#{index}.vmdk (#{store_size}GB)")
-
                   #  Figure out what SCSI slots are used.
                   r = ssh.exec!("vim-cmd vmsvc/device.getdevices #{machine.id}|"\
                     "grep -A 30 vim.vm.device.VirtualDisk|"\
                     "grep -e controllerKey -e unitNumber|grep -A 1 'controllerKey = 1000,'|"\
                     "grep unitNumber|awk '{print $3}'|sed 's/,//g'")
-
                   if r.length < 2
                     raise Errors::ESXiError,
                           message: "Unable to get guest storage configuration:\n"\
@@ -600,7 +621,6 @@ module VagrantPlugins
                     if r !~ %r{^#{slot.to_s}$}i
                       puts "Avail slot: #{slot}" if config.debug =~ %r{true}i
                       guest_disk_type = 'zeroedthick' if guest_disk_type == 'thick'
-
                       cmd = "/bin/vmkfstools -c #{store_size}G -d #{guest_disk_type} \"#{esxi_guest_dir}/disk_#{index}.vmdk\""
                       puts "cmd: #{cmd}" if config.debug =~ %r{true}i
                       r = ssh.exec!(cmd)
@@ -668,9 +688,7 @@ module VagrantPlugins
                     end
                   end
                 end
-                if line_changed == false
-                  new_vmx_contents << line
-                end
+                new_vmx_contents << line if line_changed == false
               end
             end
 
@@ -728,6 +746,13 @@ module VagrantPlugins
             end
             ssh.loop
 
+            r = ssh.exec!("vim-cmd vmsvc/reload #{env[:machine].id}")
+            vmid = r
+            if r.exitstatus != 0
+              raise Errors::ESXiError,
+                    message: "Unable to reload vmx."
+            end
+
             # Done
           end
         end

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

@@ -108,17 +108,39 @@ module VagrantPlugins
             #
             #  Encode special characters in PW
             #
-            $encoded_esxi_password = $esxi_password.gsub('%', '%25').gsub(\
-              '<', '%3c').gsub('>', '%3e').gsub(\
-              '[', '%5b').gsub(']', '%5d').gsub(\
-              '(', '%28').gsub(')', '%29').gsub(\
-              '@', '%40').gsub('#', '%23').gsub(\
-              '&', '%26').gsub(':', '%3a').gsub(\
-              '/', '%2f').gsub('\\','%5c').gsub(\
-              '"', '%22').gsub('\'','%27').gsub(\
-              '*', '%2a').gsub('?', '%3f').gsub(\
-              '$', '%24').gsub(' ', '%20').gsub(\
-              '/', '%2f')
+            $encoded_esxi_password = $esxi_password.gsub('%', '%25').\
+              gsub(' ', '%20').\
+              gsub('!', '%21').\
+              gsub('"', '%22').\
+              gsub('#', '%23').\
+              gsub('$', '%24').\
+              gsub('&', '%26').\
+              gsub('\'','%27').\
+              gsub('(', '%28').\
+              gsub(')', '%29').\
+              gsub('*', '%2a').\
+              gsub('+', '%2b').\
+              gsub(',', '%2c').\
+              gsub('-', '%2d').\
+              gsub('.', '%2e').\
+              gsub('/', '%2f').\
+              gsub(':', '%3a').\
+              gsub(';', '%3b').\
+              gsub('<', '%3c').\
+              gsub('=', '%3d').\
+              gsub('>', '%3e').\
+              gsub('?', '%3f').\
+              gsub('@', '%40').\
+              gsub('[', '%5b').\
+              gsub('\\','%5c').\
+              gsub(']', '%5d').\
+              gsub('^', '%5e').\
+              gsub('_', '%5f').\
+              gsub('`', '%60').\
+              gsub('{', '%7b').\
+              gsub('|', '%7c').\
+              gsub('}', '%7d').\
+              gsub('~', '%7e')      
 
             @logger.info('vagrant-vmware-esxi, connect_esxi: local_private_keys: '\
                          "#{config.local_private_keys}")

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

@@ -17,6 +17,7 @@ module VagrantPlugins
       attr_accessor :guest_name_prefix
       attr_accessor :guest_guestos
       attr_accessor :guest_disk_type
+      attr_accessor :guest_boot_disk_size
       attr_accessor :guest_storage
       attr_accessor :guest_nic_type
       attr_accessor :guest_mac_address
@@ -73,6 +74,7 @@ module VagrantPlugins
         @guest_name_prefix = 'V-'
         @guest_guestos = nil
         @guest_disk_type = nil
+        @guest_boot_disk_size = nil
         @guest_storage = nil
         @guest_nic_type = nil
         @guest_mac_address = ["","","",""]
@@ -364,6 +366,8 @@ module VagrantPlugins
 
         @guest_username = nil if @guest_username == UNSET_VALUE
 
+        @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
         @guest_storage = [@guest_storage.to_i] if @guest_storage.is_a? String
         @guest_storage = [@guest_storage] if @guest_storage.is_a? Integer
 
@@ -373,7 +377,6 @@ module VagrantPlugins
 
         @local_private_keys = @system_private_keys if @local_private_keys == nil
 
-        # @guest_virtualhw_version = @guest_virtualhw_version.to_i unless @guest_virtualhw_version.nil?
 
         if @local_lax =~ /true/i
           @local_lax = 'True'

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

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