chef-provisioning-vsphere 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac457d36ea3bae1eefdf3dcaba502d925840270
-  data.tar.gz: 76a60e37d9861883bc4932074c9f6d80034c2245
+  metadata.gz: 3e151627320d531a6712a2336485d7cf03f61519
+  data.tar.gz: b565bf4a774b636ccb3448ff3ba3f07d3fab1b33
 SHA512:
-  metadata.gz: 7996f02f1e180e2375fb790c06a961b8abcd32850085b31adc56e3b7feb12fbc5f6805199112443d143e2404c19c625f133a29922f48afc36d00245aa27bba31
-  data.tar.gz: 4e805e07531c27d64143917c094d3037b2e25aa2047ace08b2c2bf2eab8e78529cfc656bce0db161de72ac06d35e8510a14f67015b6ec2817806112be79754ad
+  metadata.gz: 355bc3e74e5719ff8731eaee695939add96bd675433ba79a11e19841d2a02d5c858ddba678f5f2769fb20b448af190bc0c4129894776d2c03bf4069ccd5fb56e
+  data.tar.gz: 443b85c9e3f5994a586b97a5c3a6c8875bec4f563cc25dc4eb4446c09ed977b647cd8c611efb744524e43534f7617291a2f4c782d1890011db20661d31805840

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [2.0.8](https://github.com/chef-partners/chef-provisioning-vsphere/tree/2.0.8) (2017-10-23)
-[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.7...2.0.8)
+## [2.0.9](https://github.com/chef-partners/chef-provisioning-vsphere/tree/2.0.9) (2017-10-30)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.8...2.0.9)
+
+**Closed issues:**
+
+- Networks under a distributed switch not at the rootFolder cannot be found [\#56](https://github.com/chef-partners/chef-provisioning-vsphere/issues/56)
+
+**Merged pull requests:**
+
+- Several small fixes [\#63](https://github.com/chef-partners/chef-provisioning-vsphere/pull/63) ([algaut](https://github.com/algaut))
+
+## [v2.0.8](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.0.8) (2017-10-23)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.7...v2.0.8)
 
 **Closed issues:**
 

data/Rakefile

@@ -38,4 +38,4 @@ YARD::Rake::YardocTask.new do |t|
   t.stats_options = ['--list-undoc'] # optional
 end
 
-task default: %i[style unit]
+task default: %i(style unit)

data/chef-provisioning-vsphere.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   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")
   s.test_files   = s.files.grep(%r{^(test|spec|features)/})

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

@@ -178,7 +178,7 @@ 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])$/
-      unless hostname =~ test
+      unless hostname.match?(test)
         raise 'Only letters, numbers or hyphens in hostnames allowed'
       end
       RbVmomi::VIM::CustomizationFixedName.new(name: hostname)

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

@@ -14,7 +14,7 @@ require 'chef/provisioning/vsphere_driver/vm_helper'
 # Provisions machines in vSphere.
 module ChefProvisioningVsphere
   # Inherits the Chef::Provisioning::Driver attirbutes
-  class VsphereDriver < Chef::Provisioning::Driver
+  class VsphereDriver < Chef::Provisioning::Driver # rubocop:disable Metrics/ClassLength
     include Chef::Mixin::ShellOut
 
     # Creates the new object via the URL
@@ -670,11 +670,18 @@ module ChefProvisioningVsphere
       Chef::Log.debug("Clone spec: #{clone_spec.pretty_inspect}")
 
       vm_folder = vsphere_helper.find_folder(bootstrap_options[:vm_folder])
+      last_progress = 0
       vm_template.CloneVM_Task(
         name: machine_name,
         folder: vm_folder,
         spec: clone_spec
-      ).wait_for_completion
+      ).wait_for_progress do |progress|
+        if (progress.is_a? Numeric) && (progress / 10).floor != (last_progress / 10).floor
+          print "\n#{machine_name} progress: #{progress}%"
+          last_progress = progress
+        end
+      end
+      print "\n#{machine_name} done!"
 
       vm = vsphere_helper.find_vm(vm_folder, machine_name)
 
@@ -882,7 +889,11 @@ module ChefProvisioningVsphere
         else
           ## Check if true available
           vm_ip = bootstrap_options[:customization_spec][:ipsettings][:ip] unless vm_helper.ip?
-          print '.' until @vm_helper.open_port?(vm_ip, @vm_helper.port, 1)
+          nb_attempts = 0
+          until @vm_helper.open_port?(vm_ip, @vm_helper.port, 1) || nb_attempts > bootstrap_options[:ready_timeout]
+            print '.'
+            nb_attempts += 1
+          end
         end
       else
         if use_ipv4_during_bootstrap?(bootstrap_options)

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

@@ -3,5 +3,5 @@
 # Provisions machines in vSphere.
 module ChefProvisioningVsphere
   # The version of this awesome Gem. BOOM.
-  VERSION = '2.0.8'.freeze
+  VERSION = '2.0.9'.freeze
 end

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

@@ -178,11 +178,11 @@ module ChefProvisioningVsphere
     def add_extra_nic(action_handler, vm_template, options, vm)
       deviceAdditions, changes = network_device_changes(action_handler, vm_template, options)
 
-      if deviceAdditions.count > 0
+      if deviceAdditions.count.positive?
         current_networks = find_ethernet_cards_for(vm).map { |card| network_id_for(card.backing) }
         new_devices = deviceAdditions.reject { |device| current_networks.include?(network_id_for(device.device.backing)) }
 
-        if new_devices.count > 0
+        if new_devices.count.positive?
           action_handler.report_progress 'Adding extra NICs'
           task = vm.ReconfigVM_Task(spec: RbVmomi::VIM.VirtualMachineConfigSpec(deviceChange: new_devices))
           task.wait_for_completion
@@ -396,13 +396,7 @@ module ChefProvisioningVsphere
       base = datacenter.networkFolder
       entity_array = name.split('/').reject(&:empty?)
       entity_array.each do |item|
-        case base
-        when RbVmomi::VIM::Folder
-          base = base.find(item)
-        when RbVmomi::VIM::VmwareDistributedVirtualSwitch
-          idx = base.summary.portgroupName.find_index(item)
-          base = idx.nil? ? nil : base.portgroup[idx]
-        end
+        base = traverse_folders_for_network(base, item)
       end
 
       raise "vSphere Network not found [#{name}]" if base.nil?
@@ -410,6 +404,25 @@ module ChefProvisioningVsphere
       base
     end
 
+    # Search the item through the base's children
+    # @param base vSphere object where to search
+    # @param [String] item the name of the network to look for
+    def traverse_folders_for_network(base, item)
+      Chef::Log.debug("Searching #{item} in #{base.name}")
+      case base
+      when RbVmomi::VIM::Folder
+        res = base.find(item)
+        return res unless res.nil?
+        base.childEntity.each do |child|
+          res = traverse_folders_for_network(child, item)
+          return res unless res.nil?
+        end
+      when RbVmomi::VIM::VmwareDistributedVirtualSwitch
+        idx = base.summary.portgroupName.find_index(item)
+        idx.nil? ? nil : base.portgroup[idx]
+      end
+    end
+
     # Locate the Customization Spec in vSphere.
     #
     # @param [String] customization_spec The name of the Customization Spec.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef