chef-provisioning-vsphere 0.10.0 → 1.0.0

data/Rakefile

@@ -1,22 +1,34 @@
-require 'bundler/gem_tasks'
-require 'chef/provisioning/vsphere_driver/version'
-require 'rspec/core/rake_task'
-require "rubocop/rake_task"
-
-$:.unshift(File.dirname(__FILE__) + '/lib')
-
-RuboCop::RakeTask.new(:style) do |task|
-  task.options << "--display-cop-names"
-end
-
-RSpec::Core::RakeTask.new(:unit) do |task|
-  task.pattern = 'spec/unit_tests/*_spec.rb'
-  task.rspec_opts = ['--color', '-f documentation']
-end
-
-RSpec::Core::RakeTask.new(:integration) do |task|
-  task.pattern = 'spec/integration_tests/*_spec.rb'
-  task.rspec_opts = ['--color', '-f documentation']
-end
-
-task :default => [:unit]
+# frozen_string_literal: true
+require 'bundler/gem_tasks'
+require 'chef/provisioning/vsphere_driver/version'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/lib')
+
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << '--display-cop-names'
+end
+
+RSpec::Core::RakeTask.new(:unit) do |task|
+  task.pattern = 'spec/unit_tests/*_spec.rb'
+  task.rspec_opts = ['--color', '-f documentation']
+end
+
+RSpec::Core::RakeTask.new(:integration) do |task|
+  task.pattern = 'spec/integration_tests/*_spec.rb'
+  task.rspec_opts = ['--color', '-f documentation']
+end
+
+begin
+  require 'github_changelog_generator/task'
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.future_release = ChefProvisioningVsphere::VERSION
+    config.issues = true
+  end
+rescue LoadError
+  puts 'github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs'
+end
+
+task default: [:unit]

data/chef-provisioning-vsphere.gemspec

@@ -1,4 +1,5 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
+# frozen_string_literal: true
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/lib')
 require 'chef/provisioning/vsphere_driver/version'
 
 Gem::Specification.new do |s|
@@ -8,13 +9,13 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md']
   s.summary = 'Provisioner for creating vSphere VM instances in Chef Provisioning.'
   s.description = s.summary
-  s.authors = ['CenturyLink Cloud']
-  s.email = 'matt.wrock@CenturyLinkCloud.com'
-  s.homepage = 'https://github.com/tier3/chef-provisioning-vsphere'
+  s.authors = ['CenturyLink Cloud', 'JJ Asghar']
+  s.email = 'jj@chef.io'
+  s.homepage = 'https://github.com/chef-partners/chef-provisioning-vsphere'
   s.license = 'MIT'
 
   s.bindir       = 'bin'
-  s.executables  = %w( )
+  s.executables  = %w()
 
   s.require_path = 'lib'
   s.files        = `git ls-files -z`.split("\x0")
@@ -22,8 +23,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rbvmomi', '~> 1.8.0', '>= 1.8.2'
   s.add_dependency 'chef-provisioning', '~>2.0', '>= 2.0.1'
+  s.add_dependency 'github_changelog_generator'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rubocop', '~> 0.29'
-end
+  s.add_development_dependency 'chefstyle'
+end

data/contribution-notice

@@ -1,7 +1,7 @@
-Contribution Notice
- 
-By contributing to this Project, You grant to CenturyLink and to recipients of software distributed by CenturyLink, a perpetual worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions to this Project (“Your Contributions”), including derivative works thereof.
-
-You grant to CenturyLink and to recipients of software distributed by CenturyLink a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section), patent license to make, have made, use, offer to sell, sell, import and otherwise transfer Your Contributions, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contributions(s) alone or by combination of Your Contribution(s) with this Project.  If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or this Project, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this agreement for Your Contribution or this Project shall terminate as of the date such litigation is filed.
- 
-You represent that each of Your Contributions is Your original creation and represent that You are legally entitled to grant the above license and that no other third party permission is required. If your employer(s) has rights to intellectual property that is included in Your Contributions, You represent that You have received permission to make such contributions on behalf of that employer.
+Contribution Notice
+ 
+By contributing to this Project, You grant to CenturyLink and to recipients of software distributed by CenturyLink, a perpetual worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions to this Project (“Your Contributions”), including derivative works thereof.
+
+You grant to CenturyLink and to recipients of software distributed by CenturyLink a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section), patent license to make, have made, use, offer to sell, sell, import and otherwise transfer Your Contributions, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contributions(s) alone or by combination of Your Contribution(s) with this Project.  If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or this Project, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this agreement for Your Contribution or this Project shall terminate as of the date such litigation is filed.
+ 
+You represent that each of Your Contributions is Your original creation and represent that You are legally entitled to grant the above license and that no other third party permission is required. If your employer(s) has rights to intellectual property that is included in Your Contributions, You represent that You have received permission to make such contributions on behalf of that employer.

data/lib/chef/provisioning/driver_init/vsphere.rb

@@ -1,3 +1,4 @@
-require 'chef/provisioning/vsphere_driver'
-
-Chef::Provisioning.register_driver_class('vsphere', ChefProvisioningVsphere::VsphereDriver)
+# frozen_string_literal: true
+require 'chef/provisioning/vsphere_driver'
+
+Chef::Provisioning.register_driver_class('vsphere', ChefProvisioningVsphere::VsphereDriver)

data/lib/chef/provisioning/vsphere_driver.rb

@@ -1,14 +1,16 @@
-require 'chef/provisioning'
-require 'chef/provisioning/vsphere_driver/driver'
-
-class Chef
-  module DSL
-    module Recipe
-      def with_vsphere_driver(driver_options, &block)
-        url = ChefProvisioningVsphere::VsphereDriver.canonicalize_url(
-          nil, driver_options)[0]
-        with_driver url, driver_options, &block
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+require 'chef/provisioning'
+require 'chef/provisioning/vsphere_driver/driver'
+
+class Chef
+  module DSL
+    module Recipe
+      def with_vsphere_driver(driver_options, &block)
+        url = ChefProvisioningVsphere::VsphereDriver.canonicalize_url(
+          nil, driver_options
+        )[0]
+        with_driver url, driver_options, &block
+      end
+    end
+  end
+end

data/lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ChefProvisioningVsphere
   class CloneSpecBuilder
     def initialize(vsphere_helper, action_handler)
@@ -14,10 +15,11 @@ module ChefProvisioningVsphere
         powerOn: false,
         template: false,
         config: RbVmomi::VIM.VirtualMachineConfigSpec(
-          :cpuHotAddEnabled => true,
-          :memoryHotAddEnabled => true,
-          :cpuHotRemoveEnabled => true,
-          :deviceChange => Array.new)
+          cpuHotAddEnabled: true,
+          memoryHotAddEnabled: true,
+          cpuHotRemoveEnabled: true,
+          deviceChange: []
+        )
       )
 
       unless options[:annotation].to_s.nil?
@@ -54,7 +56,7 @@ module ChefProvisioningVsphere
       rspec = RbVmomi::VIM.VirtualMachineRelocateSpec
       host = nil
 
-      if options.has_key?(:host)
+      if options.key?(:host)
         host = vsphere_helper.find_host(options[:host])
         rspec.host = host
       end
@@ -67,10 +69,9 @@ module ChefProvisioningVsphere
         raise 'either :host or :resource_pool must be specified when cloning from a VM Template'
       end
 
-
       if options[:use_linked_clone]
         if vm_template.config.template
-          Chef::Log.warn("Using a VM Template, ignoring use_linked_clone.")
+          Chef::Log.warn('Using a VM Template, ignoring use_linked_clone.')
         else
           vsphere_helper.create_delta_disk(vm_template)
           rspec.diskMoveType = :moveChildMostDiskBacking
@@ -85,9 +86,9 @@ module ChefProvisioningVsphere
     end
 
     def customization_options_from(vm_template, vm_name, options)
-      if options.has_key?(:customization_spec)
+      if options.key?(:customization_spec)
         if options[:customization_spec].is_a?(Hash) ||
-          options[:customization_spec].is_a?(Cheffish::MergedConfig)
+           options[:customization_spec].is_a?(Cheffish::MergedConfig)
           cust_options = options[:customization_spec]
           ip_settings = cust_options[:ipsettings]
           cust_domain = cust_options[:domain]
@@ -99,15 +100,18 @@ module ChefProvisioningVsphere
               raise ArgumentError, 'subnetMask is required for static ip'
             end
             cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(
-              ip_settings)
+              ip_settings
+            )
             action_handler.report_progress "customizing #{vm_name} \
               with static IP #{ip_settings[:ip]}"
             cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp(
-              :ipAddress => ip_settings[:ip])
+              ipAddress: ip_settings[:ip]
+            )
           end
           if cust_ip_settings.nil?
-            cust_ip_settings= RbVmomi::VIM::CustomizationIPSettings.new(
-              :ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
+            cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(
+              ip: RbVmomi::VIM::CustomizationDhcpIpGenerator.new
+            )
           end
 
           if ip_settings && ip_settings.key?(:dnsServerList)
@@ -124,24 +128,25 @@ module ChefProvisioningVsphere
           cust_hwclockutc = cust_options[:hw_clock_utc]
           cust_timezone = cust_options[:time_zone]
 
-          if vm_template.config.guestId.start_with?('win')
-            cust_prep = windows_prep_for(options, vm_name)
-          else
-            cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
-              :domain => cust_domain,
-              :hostName => cust_hostname,
-              :hwClockUTC => cust_hwclockutc,
-              :timeZone => cust_timezone
-            )
-          end
+          cust_prep = if vm_template.config.guestId.start_with?('win')
+                        windows_prep_for(options, vm_name)
+                      else
+                        RbVmomi::VIM::CustomizationLinuxPrep.new(
+                          domain: cust_domain,
+                          hostName: cust_hostname,
+                          hwClockUTC: cust_hwclockutc,
+                          timeZone: cust_timezone
+                        )
+                      end
           cust_adapter_mapping = [
             RbVmomi::VIM::CustomizationAdapterMapping.new(
-              :adapter => cust_ip_settings)
+              adapter: cust_ip_settings
+            )
           ]
           RbVmomi::VIM::CustomizationSpec.new(
-            :identity => cust_prep,
-            :globalIPSettings => global_ip_settings,
-            :nicSettingMap => cust_adapter_mapping
+            identity: cust_prep,
+            globalIPSettings: global_ip_settings,
+            nicSettingMap: cust_adapter_mapping
           )
         else
           vsphere_helper.find_customization_spec(options[:customization_spec])
@@ -152,50 +157,60 @@ module ChefProvisioningVsphere
     def hostname_from(options, vm_name)
       hostname = options[:hostname] || vm_name
       test = /^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])$/
-      if !(hostname =~ test)
+      unless hostname =~ test
         raise 'Only letters, numbers or hyphens in hostnames allowed'
       end
-      RbVmomi::VIM::CustomizationFixedName.new(:name => hostname)
+      RbVmomi::VIM::CustomizationFixedName.new(name: hostname)
     end
 
     def windows_prep_for(options, vm_name)
       cust_options = options[:customization_spec]
-      cust_runonce = RbVmomi::VIM::CustomizationGuiRunOnce.new(
-        :commandList => cust_options[:run_once]) unless cust_options[:run_once].nil?
+      unless cust_options[:run_once].nil?
+        cust_runonce = RbVmomi::VIM::CustomizationGuiRunOnce.new(
+          commandList: cust_options[:run_once]
+        )
+      end
 
       cust_login_password = RbVmomi::VIM::CustomizationPassword(
-        :plainText => true,
-        :value => options[:ssh][:password])
-      if cust_options.has_key?(:domain) and cust_options[:domain] != 'local'
+        plainText: true,
+        value: options[:ssh][:password]
+      )
+      if cust_options.key?(:domain) && (cust_options[:domain] != 'local')
         cust_domain_password = RbVmomi::VIM::CustomizationPassword(
-          :plainText => true,
-          :value => ENV['domainAdminPassword'] || cust_options[:domainAdminPassword])
+          plainText: true,
+          value: ENV['domainAdminPassword'] || cust_options[:domainAdminPassword]
+        )
         cust_id = RbVmomi::VIM::CustomizationIdentification.new(
-          :joinDomain => cust_options[:domain],
-          :domainAdmin => cust_options[:domainAdmin],
-          :domainAdminPassword => cust_domain_password)
-        #puts "my env passwd is: #{ENV['domainAdminPassword']}"
+          joinDomain: cust_options[:domain],
+          domainAdmin: cust_options[:domainAdmin],
+          domainAdminPassword: cust_domain_password
+        )
+        # puts "my env passwd is: #{ENV['domainAdminPassword']}"
         action_handler.report_progress "joining domain #{cust_options[:domain]} /
           with user: #{cust_options[:domainAdmin]}"
       else
         cust_id = RbVmomi::VIM::CustomizationIdentification.new(
-          :joinWorkgroup => 'WORKGROUP')
+          joinWorkgroup: 'WORKGROUP'
+        )
       end
       cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(
-        :autoLogon => true,
-        :autoLogonCount => 1,
-        :password => cust_login_password,
-        :timeZone => cust_options[:win_time_zone])
+        autoLogon: true,
+        autoLogonCount: 1,
+        password: cust_login_password,
+        timeZone: cust_options[:win_time_zone]
+      )
       cust_userdata = RbVmomi::VIM::CustomizationUserData.new(
-        :computerName => hostname_from(cust_options, vm_name),
-        :fullName => cust_options[:org_name],
-        :orgName => cust_options[:org_name],
-        :productId => cust_options[:product_id])
+        computerName: hostname_from(cust_options, vm_name),
+        fullName: cust_options[:org_name],
+        orgName: cust_options[:org_name],
+        productId: cust_options[:product_id]
+      )
       RbVmomi::VIM::CustomizationSysprep.new(
-        :guiRunOnce => cust_runonce,
-        :identification => cust_id,
-        :guiUnattended => cust_gui_unattended,
-        :userData => cust_userdata)
+        guiRunOnce: cust_runonce,
+        identification: cust_id,
+        guiUnattended: cust_gui_unattended,
+        userData: cust_userdata
+      )
     end
   end
 end

data/lib/chef/provisioning/vsphere_driver/driver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chef'
 require 'cheffish/merged_config'
 require 'chef/provisioning/driver'
@@ -30,7 +31,7 @@ module ChefProvisioningVsphere
     #   :password   - required - password to use in connection to vSphere API server
     def self.canonicalize_url(driver_url, config)
       config = symbolize_keys(config)
-      [ driver_url || URI::VsphereUrl.from_config(config).to_s, config ]
+      [driver_url || URI::VsphereUrl.from_config(config).to_s, config]
     end
 
     def self.symbolize_keys(h)
@@ -42,6 +43,16 @@ module ChefProvisioningVsphere
         ] : h
     end
 
+    def deep_symbolize(hash_like)
+      return {} if hash_like.nil? || hash_like.empty?
+      r = {}
+      hash_like.each do |key, value|
+        value = deep_symbolize(value) if value.respond_to?(:values)
+        r[key.to_sym] = value
+      end
+      r
+    end
+
     def initialize(driver_url, config)
       super(driver_url, config)
 
@@ -110,11 +121,13 @@ module ChefProvisioningVsphere
     #           -- vm_folder: name of the vSphere folder containing the VM
     #
     def allocate_machine(action_handler, machine_spec, machine_options)
+      machine_options = deep_symbolize(machine_options)
       merge_options! machine_options
 
       if machine_spec.location
         Chef::Log.warn(
-          "Checking to see if #{machine_spec.location} has been created...")
+          "Checking to see if #{machine_spec.location} has been created..."
+        )
         vm = vm_for(machine_spec)
         if vm
           Chef::Log.warn 'returning existing machine'
@@ -130,16 +143,17 @@ module ChefProvisioningVsphere
       bootstrap_options = machine_options[:bootstrap_options]
 
       action_handler.report_progress full_description(
-        machine_spec, bootstrap_options)
+        machine_spec, bootstrap_options
+      )
 
       vm = find_or_create_vm(bootstrap_options, machine_spec, action_handler)
 
       add_machine_spec_location(vm, machine_spec)
 
       action_handler.performed_action(machine_msg(
-        machine_spec.name,
-        vm.config.instanceUuid,
-        'created'
+                                        machine_spec.name,
+                                        vm.config.instanceUuid,
+                                        'created'
       ))
       vm
     end
@@ -149,6 +163,7 @@ module ChefProvisioningVsphere
         { machine_options: machine_options },
         @config
       )
+      @config = deep_symbolize(@config.to_h)
     end
 
     def add_machine_spec_location(vm, machine_spec)
@@ -183,25 +198,26 @@ module ChefProvisioningVsphere
       vm
     end
 
-   def full_description(machine_spec, bootstrap_options)
-      description = [ "creating machine #{machine_spec.name} on #{driver_url}" ]
-      bootstrap_options.to_hash.each_pair do |key,value|
-        if value.is_a?(Hash) then
+    def full_description(machine_spec, bootstrap_options)
+      description = ["creating machine #{machine_spec.name} on #{driver_url}"]
+      bootstrap_options.to_hash.each_pair do |key, value|
+        if value.is_a?(Hash)
           temp_value = value.clone
-          temp_value[:password] = "*********" if value.has_key?(:password)
+          temp_value[:password] = '*********' if value.key?(:password)
         else
           temp_value = value
         end
         description << "  #{key}: #{temp_value.inspect}"
       end
       description
-    end
+     end
 
     def machine_msg(name, id, action)
       "Machine - #{action} - #{name} (#{id} on #{driver_url})"
     end
 
     def ready_machine(action_handler, machine_spec, machine_options)
+      machine_options = deep_symbolize(machine_options)
       merge_options! machine_options
 
       vm = start_machine(action_handler, machine_spec, machine_options)
@@ -219,7 +235,7 @@ module ChefProvisioningVsphere
         machine_spec
       )
 
-      machine = machine_for(machine_spec,machine_options)
+      machine = machine_for(machine_spec, machine_options)
 
       setup_extra_nics(action_handler, bootstrap_options, vm, machine)
 
@@ -231,10 +247,8 @@ module ChefProvisioningVsphere
     end
 
     def setup_extra_nics(action_handler, bootstrap_options, vm, machine)
-      networks=bootstrap_options[:network_name]
-      if networks.kind_of?(String)
-        networks=[networks]
-      end
+      networks = bootstrap_options[:network_name]
+      networks = [networks] if networks.is_a?(String)
       return if networks.nil? || networks.count < 2
 
       new_nics = vsphere_helper.add_extra_nic(
@@ -247,7 +261,8 @@ module ChefProvisioningVsphere
         new_nics.each do |nic|
           nic_label = nic.device.deviceInfo.label
           machine.execute_always(
-            "Disable-Netadapter -Name '#{nic_label}' -Confirm:$false")
+            "Disable-Netadapter -Name '#{nic_label}' -Confirm:$false"
+          )
         end
       end
     end
@@ -281,7 +296,8 @@ module ChefProvisioningVsphere
         end
         machine_spec.location['ipaddress'] = vm.guest.ipAddress
         action_handler.report_progress(
-          "IP address obtained: #{machine_spec.location['ipaddress']}")
+          "IP address obtained: #{machine_spec.location['ipaddress']}"
+        )
       end
 
       wait_for_domain(bootstrap_options, vm, machine_spec, action_handler)
@@ -292,13 +308,13 @@ module ChefProvisioningVsphere
         # Only ever reboot once, and only if it's been less than 10 minutes
         # since we stopped waiting
         if machine_spec.location['started_at'] ||
-          remaining_wait_time(machine_spec, machine_options) < -(10*60)
+           remaining_wait_time(machine_spec, machine_options) < -(10 * 60)
           raise
         else
           Chef::Log.warn(machine_msg(
-            machine_spec.name,
-            vm.config.instanceUuid,
-            'started but SSH did not come up.  Rebooting...'
+                           machine_spec.name,
+                           vm.config.instanceUuid,
+                           'started but SSH did not come up.  Rebooting...'
           ))
           restart_server(action_handler, machine_spec, machine_options)
           wait_until_ready(action_handler, machine_spec, machine_options, vm)
@@ -313,8 +329,8 @@ module ChefProvisioningVsphere
       wait_for_ip(vm, machine_options, machine_spec, action_handler)
 
       unless has_ip?(vm_ip, vm)
-        action_handler.report_progress "rebooting..."
-        if vm.guest.toolsRunningStatus != "guestToolsRunning"
+        action_handler.report_progress 'rebooting...'
+        if vm.guest.toolsRunningStatus != 'guestToolsRunning'
           msg = 'tools have stopped. current power state is '
           msg << vm.runtime.powerState
           msg << ' and tools state is '
@@ -333,25 +349,26 @@ module ChefProvisioningVsphere
       return unless bootstrap_options[:customization_spec]
 
       domain = if bootstrap_options[:customization_spec].is_a?(String) && is_windows?(vm)
-        spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
-        spec.identity.identification.joinDomain
-      elsif bootstrap_options[:customization_spec].is_a?(String) && !is_windows?(vm)
-        spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
-        spec.identity.domain
-      else
-        bootstrap_options[:customization_spec][:domain]
+                 spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
+                 spec.identity.identification.joinDomain
+               elsif bootstrap_options[:customization_spec].is_a?(String) && !is_windows?(vm)
+                 spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
+                 spec.identity.domain
+               else
+                 bootstrap_options[:customization_spec][:domain]
       end
 
       return unless domain
 
       if is_windows?(vm) && domain != 'local'
         start = Time.now.utc
-        trimmed_name = machine_spec.name.byteslice(0,15)
-        expected_name="#{trimmed_name}.#{domain}"
+        trimmed_name = machine_spec.name.byteslice(0, 15)
+        expected_name = "#{trimmed_name}.#{domain}"
         action_handler.report_progress(
-          "waiting to domain join and be named #{expected_name}")
+          "waiting to domain join and be named #{expected_name}"
+        )
         until (Time.now.utc - start) > 30 ||
-          (vm.guest.hostName == expected_name) do
+              (vm.guest.hostName == expected_name)
           print '.'
           sleep 5
         end
@@ -363,14 +380,15 @@ module ChefProvisioningVsphere
       vm_ip = ip_to_bootstrap(bootstrap_options, vm)
       ready_timeout = machine_options[:ready_timeout] || 300
       msg = "waiting up to #{ready_timeout} seconds for customization"
-      msg << " and find #{vm_ip}" unless vm_ip ==  vm.guest.ipAddress
+      msg << " and find #{vm_ip}" unless vm_ip == vm.guest.ipAddress
       action_handler.report_progress msg
 
       start = Time.now.utc
       connectable = false
-      until (Time.now.utc - start) > ready_timeout || connectable do
+      until (Time.now.utc - start) > ready_timeout || connectable
         action_handler.report_progress(
-          "IP addresses found: #{all_ips_for(vm)}")
+          "IP addresses found: #{all_ips_for(vm)}"
+        )
         vm_ip ||= ip_to_bootstrap(bootstrap_options, vm)
         if has_ip?(vm_ip, vm)
           connectable = transport_for(
@@ -384,7 +402,7 @@ module ChefProvisioningVsphere
     end
 
     def all_ips_for(vm)
-      vm.guest.net.map { |net| net.ipAddress}.flatten
+      vm.guest.net.map(&:ipAddress).flatten
     end
 
     def has_ip?(ip, vm)
@@ -393,11 +411,13 @@ module ChefProvisioningVsphere
 
     # Connect to machine without acquiring it
     def connect_to_machine(machine_spec, machine_options)
+      machine_options = deep_symbolize(machine_options)
       merge_options! machine_options
       machine_for(machine_spec, machine_options)
     end
 
     def destroy_machine(action_handler, machine_spec, machine_options)
+      machine_options = deep_symbolize(machine_options)
       merge_options! machine_options
       vm = vm_for(machine_spec)
       if vm
@@ -406,7 +426,7 @@ module ChefProvisioningVsphere
             vsphere_helper.stop_vm(vm, machine_options[:stop_timeout])
             vm.Destroy_Task.wait_for_completion
           rescue RbVmomi::Fault => fault
-            raise fault unless fault.fault.class.wsdl_name == "ManagedObjectNotFound"
+            raise fault unless fault.fault.class.wsdl_name == 'ManagedObjectNotFound'
           ensure
             machine_spec.location = nil
           end
@@ -417,6 +437,7 @@ module ChefProvisioningVsphere
     end
 
     def stop_machine(action_handler, machine_spec, machine_options)
+      machine_options = deep_symbolize(machine_options)
       merge_options! machine_options
       vm = vm_for(machine_spec)
       if vm
@@ -427,6 +448,7 @@ module ChefProvisioningVsphere
     end
 
     def start_machine(action_handler, machine_spec, machine_options)
+      machine_options = deep_symbolize(machine_options)
       merge_options! machine_options
       vm = vm_for(machine_spec)
       if vm
@@ -447,20 +469,20 @@ module ChefProvisioningVsphere
 
     protected
 
-    def setup_ubuntu_dns(machine, bootstrap_options, machine_spec)
+    def setup_ubuntu_dns(machine, bootstrap_options, _machine_spec)
       host_lookup = machine.execute_always('host google.com')
       if host_lookup.exitstatus != 0
-        if host_lookup.stdout.include?("setlocale: LC_ALL")
+        if host_lookup.stdout.include?('setlocale: LC_ALL')
           machine.execute_always('locale-gen en_US && update-locale LANG=en_US')
         end
         distro = machine.execute_always("lsb_release -i | sed -e 's/Distributor ID://g'").stdout.strip
         Chef::Log.info "Found distro:#{distro}"
         if distro == 'Ubuntu'
-          distro_version = (machine.execute_always("lsb_release -r | sed -e s/[^0-9.]//g")).stdout.strip.to_f
+          distro_version = machine.execute_always('lsb_release -r | sed -e s/[^0-9.]//g').stdout.strip.to_f
           Chef::Log.info "Found distro version:#{distro_version}"
-          if distro_version>= 12.04
-            Chef::Log.info "Ubuntu version 12.04 or greater. Need to patch DNS."
-            interfaces_file = "/etc/network/interfaces"
+          if distro_version >= 12.04
+            Chef::Log.info 'Ubuntu version 12.04 or greater. Need to patch DNS.'
+            interfaces_file = '/etc/network/interfaces'
             nameservers = bootstrap_options[:customization_spec][:ipsettings][:dnsServerList].join(' ')
             machine.execute_always("if ! cat #{interfaces_file} | grep -q dns-search ; then echo 'dns-search #{bootstrap_options[:customization_spec][:domain]}' >> #{interfaces_file} ; fi")
             machine.execute_always("if ! cat #{interfaces_file} | grep -q dns-nameservers ; then echo 'dns-nameservers #{nameservers}' >> #{interfaces_file} ; fi")
@@ -472,15 +494,15 @@ module ChefProvisioningVsphere
     end
 
     def has_static_ip(bootstrap_options)
-      if bootstrap_options.has_key?(:customization_spec)
+      if bootstrap_options.key?(:customization_spec)
         bootstrap_options = bootstrap_options[:customization_spec]
 
         if bootstrap_options.is_a?(String)
           spec = vsphere_helper.find_customization_spec(bootstrap_options)
           return spec.nicSettingMap[0].adapter.ip.is_a?(RbVmomi::VIM::CustomizationFixedIp)
-        elsif bootstrap_options.has_key?(:ipsettings)
+        elsif bootstrap_options.key?(:ipsettings)
           bootstrap_options = bootstrap_options[:ipsettings]
-          return bootstrap_options.has_key?(:ip)
+          return bootstrap_options.key?(:ip)
         end
       end
       false
@@ -492,17 +514,17 @@ module ChefProvisioningVsphere
           (Time.now.utc - Time.parse(machine_spec.location['started_at']))
       else
         (machine_options[:create_timeout] || 600) -
-         (Time.now.utc - Time.parse(machine_spec.location['allocated_at']))
+          (Time.now.utc - Time.parse(machine_spec.location['allocated_at']))
       end
     end
 
     def wait_until_ready(action_handler, machine_spec, machine_options, vm)
-      if vm.guest.toolsRunningStatus != "guestToolsRunning"
+      if vm.guest.toolsRunningStatus != 'guestToolsRunning'
         if action_handler.should_perform_actions
           action_handler.report_progress "waiting for #{machine_spec.name} (#{vm.config.instanceUuid} on #{driver_url}) to be ready ..."
           until remaining_wait_time(machine_spec, machine_options) < 0 ||
-            (vm.guest.toolsRunningStatus == "guestToolsRunning" && vm.guest.ipAddress && !vm.guest.ipAddress.empty?) do
-            print "."
+                (vm.guest.toolsRunningStatus == 'guestToolsRunning' && vm.guest.ipAddress && !vm.guest.ipAddress.empty?)
+            print '.'
             sleep 5
           end
           action_handler.report_progress "#{machine_spec.name} is now ready"
@@ -513,8 +535,6 @@ module ChefProvisioningVsphere
     def vm_for(machine_spec)
       if machine_spec.location
         vsphere_helper.find_vm_by_id(machine_spec.location['server_id'])
-      else
-        nil
       end
     end
 
@@ -535,7 +555,7 @@ module ChefProvisioningVsphere
       vm = vsphere_helper.find_vm(vm_folder, machine_name)
 
       additional_disk_size_gb = bootstrap_options[:additional_disk_size_gb]
-      if !additional_disk_size_gb.is_a?(Array)
+      unless additional_disk_size_gb.is_a?(Array)
         additional_disk_size_gb = [additional_disk_size_gb]
       end
 
@@ -589,10 +609,12 @@ module ChefProvisioningVsphere
 
       if machine_spec.location['is_windows']
         Chef::Provisioning::Machine::WindowsMachine.new(
-          machine_spec, transport, strategy)
+          machine_spec, transport, strategy
+        )
       else
         Chef::Provisioning::Machine::UnixMachine.new(
-          machine_spec, transport, strategy)
+          machine_spec, transport, strategy
+        )
       end
     end
 
@@ -612,17 +634,20 @@ module ChefProvisioningVsphere
         mopts[:chef_server][:options] = mopts[:chef_server][:options].to_hash.dup if mopts[:chef_server][:options]
       end
 
-      if !machine_spec.location
+      unless machine_spec.location
         return Chef::Provisioning::ConvergenceStrategy::NoConverge.new(
-          mopts, config)
+          mopts, config
+        )
       end
 
       if machine_spec.location['is_windows']
         Chef::Provisioning::ConvergenceStrategy::InstallMsi.new(
-          mopts, config)
+          mopts, config
+        )
       else
         Chef::Provisioning::ConvergenceStrategy::InstallCached.new(
-          mopts, config)
+          mopts, config
+        )
       end
     end
 
@@ -631,12 +656,12 @@ module ChefProvisioningVsphere
         machine_spec,
         machine_options[:bootstrap_options][:ssh]
       )
-      if !transport.available?
+      unless transport.available?
         if action_handler.should_perform_actions
           action_handler.report_progress "waiting for #{machine_spec.name} (#{vm.config.instanceUuid} on #{driver_url}) to be connectable (transport up and running) ..."
 
-          until remaining_wait_time(machine_spec, machine_options) < 0 || transport.available? do
-            print "."
+          until remaining_wait_time(machine_spec, machine_options) < 0 || transport.available?
+            print '.'
             sleep 5
           end
 
@@ -663,12 +688,12 @@ module ChefProvisioningVsphere
         options[:winrm_transport].nil? ? :negotiate : options[:winrm_transport].to_sym
       port = options[:port] || winrm_transport == :ssl ? '5986' : '5985'
       winrm_options = {
-        user: "#{options[:user]}",
+        user: (options[:user]).to_s,
         pass: options[:password]
       }
       if options[:winrm_opts].nil?
-        opt = options[:user].include?("\\") ? :disable_sspi : :basic_auth_only
-        winrm_options.merge!(opt => true)
+        opt = options[:user].include?('\\') ? :disable_sspi : :basic_auth_only
+        winrm_options[opt] = true
       else
         winrm_options.merge!(options[:winrm_opts])
       end
@@ -686,11 +711,12 @@ module ChefProvisioningVsphere
     def create_ssh_transport(host, options)
       require 'chef/provisioning/transport/ssh'
       ssh_user = options[:user]
+      options = options.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v; }
       Chef::Provisioning::Transport::SSH.new(
         host,
         ssh_user,
         options.to_hash,
-        @config[:machine_options][:sudo] ? {:prefix => 'sudo '} : {},
+        @config[:machine_options][:sudo] ? { prefix: 'sudo ' } : {},
         config
       )
     end