chef-provisioning-vsphere 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e71e31626651f823006e5840334c2657d737a5
-  data.tar.gz: f681531d8693a2cf0339c56fb9dd79345eba07fc
+  metadata.gz: db6d5c3d59108b03b2a029d28ea964177b662d3f
+  data.tar.gz: 002c4faa621c11d98ac61aa0520cf01beda33f5e
 SHA512:
-  metadata.gz: 46304efbe3b4c6601a4ffd873db3aa53ed7c9ce565ea62e113161b11694ae1d723283bea0dd12f5d1c62d8281bec717570e4f0c90b3cc0df8072049634ea8011
-  data.tar.gz: 6b06cea303a50af9937253ffeb72564df58fe9e76540596d5116374b404258dfc7baa0e2eae3cff009a14d895d9cdc98b92261607818b78d0e9e59ab6cb9e03b
+  metadata.gz: 19483a0d6ce2f112ddaa71021f01bb5e6bb01079d7ca48e060201fe167666e004b4476154d07b709be62fb02ad6e76ec0c0730c35566e4b7fa7d23ddc40c69fd
+  data.tar.gz: bd2984e7b7daf67e1acf20d03969346cb949c423566adce6a45bf70f663da1d5aa14591b166b0846fa7e59bef2ea1a0667e28f0bc3a65430b44992c08e840d49

data/.gitignore

@@ -7,4 +7,5 @@ Gemfile.lock
 my_cookbook
 .DS_Store
 doc/
-.yardoc/
+.yardoc/
+.kitchen/

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [2.0.4](https://github.com/chef-partners/chef-provisioning-vsphere/tree/2.0.4) (2017-05-24)
-[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.3...2.0.4)
+## [2.0.5](https://github.com/chef-partners/chef-provisioning-vsphere/tree/2.0.5) (2017-06-06)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.4...2.0.5)
+
+**Closed issues:**
+
+- kitchen destroy not destroying machines [\#37](https://github.com/chef-partners/chef-provisioning-vsphere/issues/37)
+
+**Merged pull requests:**
+
+- @vm\_helper.ip is this global structure, which gets set to the current… [\#41](https://github.com/chef-partners/chef-provisioning-vsphere/pull/41) ([jjlimepoint](https://github.com/jjlimepoint))
+- Handle blank guest IP address that generates multiple different errors. [\#38](https://github.com/chef-partners/chef-provisioning-vsphere/pull/38) ([Belogix](https://github.com/Belogix))
+
+## [v2.0.4](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.0.4) (2017-05-24)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.3...v2.0.4)
 
 **Merged pull requests:**
 

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

@@ -283,14 +283,14 @@ module ChefProvisioningVsphere
 
       machine = machine_for(machine_spec, machine_options)
 
-      setup_extra_nics(action_handler, bootstrap_options, vm, machine)
+      setup_extra_nics(action_handler, bootstrap_options, vm, machine, machine_spec)
 
       if has_static_ip(bootstrap_options) && !is_windows?(vm)
         setup_ubuntu_dns(machine, bootstrap_options, machine_spec)
       end
 
       ## Check if true available after added nic
-      @vm_helper.open_port?(@vm_helper.ip, @vm_helper.port) unless @vm_helper.ip.nil?
+      @vm_helper.open_port?(machine_spec.location["ipaddress"], @vm_helper.port) unless machine_spec.location["ipaddress"].nil?
       machine
     end
 
@@ -300,7 +300,7 @@ module ChefProvisioningVsphere
     # @param [Object] bootstrap_options taken from Chef provisioning for all the bootstrap options.
     # @param [Object] vm The VM object.
     # @param [Object] machine The machine object.
-    def setup_extra_nics(action_handler, bootstrap_options, vm, machine)
+    def setup_extra_nics(action_handler, bootstrap_options, vm, machine, machine_spec)
       networks = bootstrap_options[:network_name]
       networks = [networks] if networks.is_a?(String)
       return if networks.nil? || networks.count < 2
@@ -311,7 +311,7 @@ module ChefProvisioningVsphere
         bootstrap_options,
         vm
       )
-      if is_windows?(vm) && !new_nics.nil? && @vm_helper.open_port?(@vm_helper.ip, @vm_helper.port)
+      if is_windows?(vm) && !new_nics.nil? && @vm_helper.open_port?(machine_spec.location["ipaddress"], @vm_helper.port)
         new_nics.each do |nic|
           nic_label = nic.device.deviceInfo.label
           machine.execute_always(
@@ -346,6 +346,7 @@ module ChefProvisioningVsphere
         # or the ip reported back by the vm if using dhcp
         # it *may* be nil if just cloned
         vm_ip = ip_to_bootstrap(bootstrap_options, vm) || vm.guest.ipAddress
+        machine_spec.location["ipaddress"] = vm_ip
         transport = nil
         unless vm_ip.nil?
           transport = transport_for(machine_spec, bootstrap_options[:ssh], vm_ip)
@@ -356,7 +357,7 @@ module ChefProvisioningVsphere
         end
         machine_spec.location["ipaddress"] = vm_ip # vm.guest.ipAddress vmWare ip_address here can be 0.0.0.0
         action_handler.report_progress(
-          "IP address obtained: #{machine_spec.location['ipaddress']}"
+          "IP address obtained: #{machine_spec.location["ipaddress"]}"
         )
       end
 
@@ -390,6 +391,7 @@ module ChefProvisioningVsphere
     # @param [Object] machine_spec The spec required to talk to the VM.
     def attempt_ip(machine_options, action_handler, vm, machine_spec)
       vm_ip = ip_to_bootstrap(machine_options[:bootstrap_options], vm)
+      machine_spec.location["ipaddress"] = vm_ip
 
       wait_for_ip(vm, machine_options, machine_spec, action_handler)
 
@@ -457,11 +459,12 @@ module ChefProvisioningVsphere
       ip_to_bootstrap(bootstrap_options, vm)
       ready_timeout = machine_options[:ready_timeout] || 300
       msg1 = "waiting up to #{ready_timeout} seconds for customization"
-      msg2 = " and find #{@vm_helper.ip}" if @vm_helper.ip? # unless vm_ip == vm.guest.ipAddress # RuntimeError: can't modify frozen String
+      msg2 = " and find #{machine_spec.location["ipaddress"]}" unless machine_spec.location["ipaddress"].nil? # unless vm_ip == vm.guest.ipAddress # RuntimeError: can't modify frozen String
       msg = [msg1, msg2].join
       action_handler.report_progress msg
 
       vm_ip = ip_to_bootstrap(bootstrap_options, vm) || vm.guest.ipAddress
+      machine_spec.location["ipaddress"] = vm_ip
       until transport_for(
         machine_spec,
         machine_options[:bootstrap_options][:ssh],
@@ -471,6 +474,7 @@ module ChefProvisioningVsphere
           "IP addresses found: #{all_ips_for(vm)}"
         )
         vm_ip = ip_to_bootstrap(bootstrap_options, vm) || vm.guest.ipAddress
+        machine_spec.location["ipaddress"] = vm_ip
         if has_ip?(vm_ip, vm)
           transport_for(
             machine_spec,
@@ -869,24 +873,25 @@ module ChefProvisioningVsphere
     # @param [Object] vm The VM object from Chef-Provisioning
     def ip_to_bootstrap(bootstrap_options, vm)
       @vm_helper.find_port?(vm, bootstrap_options) unless vm_helper.port?
+      vm_ip = nil
       if has_static_ip(bootstrap_options)
         if bootstrap_options[:customization_spec].is_a?(String)
           spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
-          @vm_helper.ip = spec.nicSettingMap[0].adapter.ip.ipAddress
+          vm_ip = spec.nicSettingMap[0].adapter.ip.ipAddress
         else
           ## Check if true available
-          @vm_helper.ip = bootstrap_options[:customization_spec][:ipsettings][:ip] unless vm_helper.ip?
-          print "." until @vm_helper.open_port?(@vm_helper.ip, @vm_helper.port, 1)
+          vm_ip = bootstrap_options[:customization_spec][:ipsettings][:ip] unless vm_helper.ip?
+          print "." until @vm_helper.open_port?(vm_ip, @vm_helper.port, 1)
         end
       else
         if use_ipv4_during_bootstrap?(bootstrap_options)
-          until @vm_helper.open_port?(@vm_helper.ip, @vm_helper.port, 1)
+          until @vm_helper.open_port?(vm_ip, @vm_helper.port, 1)
             wait_for_ipv4(bootstrap_ip_timeout(bootstrap_options), vm)
           end
         end
-        @vm_helper.ip = vm.guest.ipAddress until vm_guest_ip?(vm) && @vm_helper.open_port?(@vm_helper.ip, @vm_helper.port, 1) # Don't set empty ip
+        vm_ip = vm.guest.ipAddress until vm_guest_ip?(vm) && @vm_helper.open_port?(vm_ip, @vm_helper.port, 1) # Don't set empty ip
       end
-      @vm_helper.ip.to_s
+      vm_ip.to_s
     end
 
     # Force IPv4 a bootstrap, default: false
@@ -922,10 +927,10 @@ module ChefProvisioningVsphere
       while start_search_ip && (tries += 1) <= max_tries
         print "."
         sleep sleep_time
-        @vm_helper.ip = vm.guest.ipAddress if vm_guest_ip?(vm)
-        start_search_ip = false if @vm_helper.open_port?(@vm_helper.ip, @vm_helper.port, 1)
+        vm_ip = vm.guest.ipAddress if vm_guest_ip?(vm)
+        start_search_ip = false if @vm_helper.open_port?(vm_ip, @vm_helper.port, 1)
       end
-      raise "Timed out waiting for ipv4 address!" if tries > max_tries && !IPAddr.new(vm.guest.ipAddress).ipv4?
+      raise "Timed out waiting for ipv4 address!" if tries > max_tries
       puts "Found ipv4 address!"
       true
     end

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

@@ -2,5 +2,5 @@
 # Provisions machines in vSphere.
 module ChefProvisioningVsphere
   # The version of this awesome Gem. BOOM.
-  VERSION = "2.0.4".freeze
+  VERSION = "2.0.5".freeze
 end

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

@@ -57,6 +57,7 @@ module ChefProvisioningVsphere
     # @param [Integer] timeout The number of seconds before timeout.
     # @return [true] Returns true when the socket is available to connect.
     def open_port?(host, port, timeout = 5)
+      return false if host.to_s.empty?
       true if ::Socket.tcp(host, port, connect_timeout: timeout)
     rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH
       false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi