vagrant-vmware-esxi 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5daa11a6e5b364f38c0676918faa0b733e8dc3c
-  data.tar.gz: dd212a04fa4836c7f187c336a9783f5975272eb1
+  metadata.gz: 5d0834aff046d2b6fdb5d399570a17e186db96af
+  data.tar.gz: 7a102b5eda42f9314a8cb80ed75caae98b286f38
 SHA512:
-  metadata.gz: a515dc8d554fc85b8023f0414014ff966c41063adfa6ed9a9bdcae9dc14d2a289afe242ede60e89d6455afffc121ba9b851a7be7be89b6a907c6565bc0005e4b
-  data.tar.gz: cd4f60c7d90e86e23b2ecfb210c0e7b1ece805e6072f647e364127a40af3db9be7e19d18d86b9da922698be4396391e2211d5db8fce96f9a644f177830de6c48
+  metadata.gz: 4319d1e60822a7fe713b5300e14f5bb7a77ef5a369eed508c41de448e1b0d20ad85c0667c8e03572a9a0a19db6375a7623e41975bfe1c3b4b10d343c594e6779
+  data.tar.gz: b951da71fc3e6fef1ce65f698bc18d1175f4c94f9a9638c83103df89675e228ab4db7d801cd3c55c39f42914a55dec775300a1e6d78f4ff0da2214275b3d8157

data/README.md

@@ -21,14 +21,14 @@ Features and Compatibility
   * Automatic VM names are 'PREFIX-HOSTNAME-USERNAME-DIR'.
 * Multi machine capable.
 * Supports adding your VM to Resource Pools to partition CPU and memory usage from other VMs on your ESXi host.
-* suspend / resume.
-* snapshots.
+* suspend, resume, snapshots.
 * rsync & NFS using built-in Vagrant synced folders.
 * Provision using built-in Vagrant provisioner.
 * package your vm's into boxes.
 * 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 provisioned using thin, thick or eagerzeroedthick.
+* Create additional guest storage (upto 14 virtual disks).
 * Specify GuestOS types, virtual HW version, or any custom vmx settings.
 
 Requirements
@@ -39,7 +39,7 @@ Requirements
 3. You MUST enable ssh access on your ESXi hypervisor.
   * Google 'How to enable ssh access on esxi'
 4. The boxes must have open-vm-tools or vmware-tools installed to properly transition to the 'running' state.
-5. In general, you should know how to use vagrant and esxi...
+5. In general, you should know how to use vagrant, esxi and some networking...
 
 Why this plugin?
 ----------------
@@ -172,6 +172,11 @@ Vagrant.configure('2') do |config|
     #    'thin', 'thick', or 'eagerzeroedthick'
     #esxi.guest_disk_type = 'thick'
 
+    #  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.
+    #esxi.guest_storage = [10,20]
+
     #  OPTIONAL. specify snapshot options.
     #esxi.guest_snapshot_includememory = 'true'
     #esxi.guest_snapshot_quiesced = 'true'
@@ -253,25 +258,28 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 2.0.2 Add support to add additional storage to guest vms.
+        Fix, encode (space) in esxi passwords.
+
 * 2.0.1 Updated version:
-      Most Vagrantfile options have been renamed to be consistent and for clarity.
-      vagrant up, more organized summary by esxi/guest options.
-      Lots of Code cleanup.
-      Add support for snapshot options (includeMemory & quiesced)
-      Snapshot save/push adds a description.
+        Most Vagrantfile options have been renamed to be consistent and for clarity.
+        vagrant up, more organized summary by esxi/guest options.
+        Lots of Code cleanup.
+        Add support for snapshot options (includeMemory & quiesced)
+        Snapshot save/push adds a description.
 
 * 1.5.1 Fix:
-      Improve debug output.
-      Fix password encoding for @ character.
-      Automatically add a virtual network when configuring a public_network or private_network.
+        Improve debug output.
+        Fix password encoding for @ character.
+        Automatically add a virtual network when configuring a public_network or private_network.
 
 * 1.5.0 Add support for:
-      Specify guest_custom_vmx_settings (to add or modify vmx settings).
-      Specify Virtual HW version.
-      Allow $ in Password.
-      Disk types (thick, thin, eagerzeroedthick).
-      Specify a guestOS type (see list above).
-      Relocal_laxed ovftool setting (--local_lax), to allow importing strange ovf boxes.
+        Specify guest_custom_vmx_settings (to add or modify vmx settings).
+        Specify Virtual HW version.
+        Allow $ in Password.
+        Disk types (thick, thin, eagerzeroedthick).
+        Specify a guestOS type (see list above).
+        Relocal_laxed ovftool setting (--local_lax), to allow importing strange ovf boxes.
 
 * 1.4.0 Add support to set MAC and IP addresses for network interfaces.
 * 1.3.2 Fix, Don't timeout ssh connection when ovftool takes a long time to upload image.

data/example_box/Vagrantfile

@@ -153,6 +153,14 @@ Vagrant.configure('2') do |config|
     #    'thin', 'thick', or 'eagerzeroedthick'
     #esxi.guest_disk_type = 'thick'
 
+    #  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
+    #    virtual disks will be created and added to the guest, however you must
+    #    provision it.  The disks can be used for lvm, partitioned, raw disk
+    #    for data bases, etc...
+    #esxi.guest_storage = [10,20]
+
     #  OPTIONAL & RISKY.  Specify up to 4 MAC addresses
     #    The default is ovftool to automatically generate a MAC address.
     #    You can specify an array of MAC addresses using upper or lower case,

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

@@ -325,6 +325,8 @@ module VagrantPlugins
                   new_guest_mac_address[index] = ''
                 else
                   new_guest_mac_address[index] = "invalid"
+                  env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                     message: "WARNING         : Ignored invalid mac address at index[#{index}]")
                 end
               end
             end
@@ -361,6 +363,24 @@ module VagrantPlugins
             end
           end
 
+          #  Validate guest Storage
+          if config.guest_storage.is_a? Array
+            new_guest_storage = []
+            0.upto(config.guest_storage.count - 1) do |index|
+              store_size = config.guest_storage[index].to_i
+              if store_size < 1
+                env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                     message: 'WARNING         : Ignored invalid '\
+                                     "storage size #{config.guest_storage[index]} at "\
+                                     "index[#{index}]")
+                new_guest_storage[index] = "invalid"
+              else
+                new_guest_storage[index] = store_size
+              end
+            end
+            config.guest_storage = new_guest_storage
+          end
+
           #  Validate virtual HW levels
           unless config.guest_virtualhw_version.nil?
             if config.supported_guest_virtualhw_versions.include? config.guest_virtualhw_version.to_i
@@ -412,7 +432,7 @@ module VagrantPlugins
                                message: "CPUS            : #{desired_guest_numvcpus}")
           unless config.guest_mac_address[0].eql? ''
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                 message: "Mac Address     : #{config.guest_mac_address}")
+                                 message: "Mac Address     : #{config.guest_mac_address[0..3]}")
           end
           unless guest_nic_type.nil?
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
@@ -422,6 +442,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_storage.nil?
+            env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                 message: "Storage (GB)    : #{config.guest_storage[0..13]}")
+          end
           env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                message: "Guest OS type   : #{config.guest_guestos}")
           unless guest_virtualhw_version.nil?
@@ -436,7 +460,8 @@ module VagrantPlugins
             env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
                                  message: 'Allow Overwrite : True')
           end
-
+          env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                               message: "  --- Guest Build ---")
 
           #
           # Using ovftool, import vmx in box folder, export to ESXi server
@@ -477,7 +502,8 @@ module VagrantPlugins
           end
 
           #
-          #  Re-open the network connection to get VMID
+          #  Re-open the network connection to get VMID and do final adjustments
+          #  to vmx file.
           #
           Net::SSH.start(config.esxi_hostname, config.esxi_username,
             password:                   $esxi_password,
@@ -506,19 +532,81 @@ module VagrantPlugins
             dst_vmx = ssh.exec!("vim-cmd vmsvc/get.config #{env[:machine].id} |\
                     grep vmPathName|awk '{print $NF}'|sed 's/[\"|,]//g'")
 
-            dst_vmx_dir = ssh.exec!("vim-cmd vmsvc/get.config #{env[:machine].id} |"\
+            dst_vmx_ds = ssh.exec!("vim-cmd vmsvc/get.config #{env[:machine].id} |"\
                     'grep vmPathName|grep -oE "\[.*\]"')
 
+            dst_vmx_dir = ssh.exec!("vim-cmd vmsvc/get.config #{env[:machine].id} |\
+                    grep vmPathName|awk '{print $NF}'|awk -F'\/' '{print $1}'")
+
+
             dst_vmx_file = "/vmfs/volumes/"
-            dst_vmx_file << dst_vmx_dir.gsub('[','').gsub(']','').strip + "/"
+            dst_vmx_file << dst_vmx_ds.gsub('[','').gsub(']','').strip + "/"
+            esxi_guest_dir = dst_vmx_file + dst_vmx_dir.strip
             dst_vmx_file << dst_vmx
 
+            #  Create storage if required
+            if config.guest_storage.is_a? Array
+              index = -1
+              config.guest_storage.each do |store|
+                store_size = store.to_i
+                index += 1
+                if store_size == 0
+                  env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                       message: "Creating Storage: Skipping --invalid-- at storage[#{index}]")
+                elsif index > 14
+                  env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
+                                       message: "Creating Storage: Skipping storage[#{index}], Maximum 14 devices exceeded...")
+                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"\
+                                   "  #{r}"\
+                                   '  Review ESXi logs for additional information!'
+                  end
+                  0.upto(15) do |slot|
+                    next if slot == 7
+                    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)
+                      if r.exitstatus != 0
+                        raise Errors::ESXiError,
+                              message: "Unable to create guest storage (vmkfstools failed):\n"\
+                                       "  #{r}"\
+                                       '  Review ESXi logs for additional information!'
+                      end
+                      r = ssh.exec!("vim-cmd vmsvc/device.diskaddexisting #{env[:machine].id} "\
+                        "#{esxi_guest_dir}/disk_#{index}.vmdk 0 #{slot}")
+                      if r.exitstatus != 0
+                        raise Errors::ESXiError,
+                              message: "Unable to create guest storage (vmkfstools failed):\n"\
+                                       "  #{r}"\
+                                       '  Review ESXi logs for additional information!'
+                      end
+                      break
+                    end
+                  end
+                end
+              end
+            end
+
             #  Get vmx file in memory
             esxi_orig_vmx_file = ssh.exec!("cat #{dst_vmx_file} 2>/dev/null")
-            if config.debug =~ %r{vmx}i
-              puts "orig vmx: #{esxi_orig_vmx_file}"
-              puts "\n\n"
-            end
+
+            puts "orig vmx: #{esxi_orig_vmx_file}\n\n" if config.debug =~ %r{vmx}i
+
             if esxi_orig_vmx_file.exitstatus != 0
               raise Errors::ESXiError,
                     message: "Unable to read #{dst_vmx_file}"
@@ -574,8 +662,6 @@ module VagrantPlugins
                   elsif guest_mac_address == ''
                     new_vmx_contents << line
                   else
-                    env[:ui].info I18n.t('vagrant_vmware_esxi.vagrant_vmware_esxi_message',
-                                       message: "Ignored invalid mac address at index: #{nicindex}")
                     new_vmx_contents << line
                   end
                 end
@@ -656,6 +742,10 @@ module VagrantPlugins
                                      message: 'ESXi vmx file    : Unmodified')
               end
             end
+
+
+
+            # Done
           end
         end
       end

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

@@ -107,7 +107,7 @@ module VagrantPlugins
             '/', '%2f').gsub('\\','%5c').gsub(\
             '"', '%22').gsub('\'','%27').gsub(\
             '*', '%2a').gsub('?', '%3f').gsub(\
-            '$', '%24')
+            '$', '%24').gsub(' ', '%20')
 
           @logger.info('vagrant-vmware-esxi, connect_esxi: local_private_keys: '\
                        "#{config.local_private_keys}")

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

@@ -16,6 +16,7 @@ module VagrantPlugins
       attr_accessor :guest_name_prefix
       attr_accessor :guest_guestos
       attr_accessor :guest_disk_type
+      attr_accessor :guest_storage
       attr_accessor :guest_nic_type
       attr_accessor :guest_mac_address
       attr_accessor :guest_memsize
@@ -67,6 +68,7 @@ module VagrantPlugins
         @guest_name_prefix = 'V-'
         @guest_guestos = nil
         @guest_disk_type = nil
+        @guest_storage = nil
         @guest_nic_type = nil
         @guest_mac_address = ["","","",""]
         @guest_memsize = nil
@@ -352,6 +354,9 @@ module VagrantPlugins
 
         @guest_username = nil if @guest_username == UNSET_VALUE
 
+        @guest_storage = [@guest_storage.to_i] if @guest_storage.is_a? String
+        @guest_storage = [@guest_storage] if @guest_storage.is_a? Integer
+
         @esxi_virtual_network = [@esxi_virtual_network] if @esxi_virtual_network.is_a? String
 
         @esxi_virtual_network = ['--NotSet--'] if @esxi_virtual_network.nil?

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

@@ -1,7 +1,7 @@
 #  VERSION
 module VagrantPlugins
   module ESXi
-    VERSION = '2.0.1'
+    VERSION = '2.0.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-02-11'
+  s.date            = '2018-02-15'
   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.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jonathan Senkerik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n