knife-vsphere 1.2.10 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8744f4dced691474dbef64dc35252b1170b23b71
-  data.tar.gz: 803b33b46cb2777d17fab8aed5839b977354be73
+  metadata.gz: 041173b0bb8d4791d22c9834ff1759992ef9143f
+  data.tar.gz: 2ab04c24568487e1a624bbed1338faef8f5b219b
 SHA512:
-  metadata.gz: 2bef8808a65ca410c3b2ad8ffebce83dc68005d3981c7e5941d0e23365cff68368ea90f570066e0904aba06d769cf49f161afbbbafaf6f2def1a5db6e17c8ad9
-  data.tar.gz: a562ecacc7097eca37b7000f2b4e0709fcfbf43ce9de233f78e071eb69d28874a7e4fa13511151218a82f419abe39f6d60813b9ca6a13f99d2c7bbbc3cb71bcd
+  metadata.gz: c08fffec7d372bc2f5011d1d9aef0e4cf83d01a9976eae560fc8b196430379e75f7c765047127fb325dcd54b30738aeb5dcbb4a1d6cf8513f50792a35e458adf
+  data.tar.gz: 7f8323b13c044d45b9ad926fa1626d2f12efcc1f48a3aaa7e31a612b98049942115a03c41ba507dbbec9557fc752148ea1e520f1f7eb5a54a82daba67f59273b

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -3,6 +3,7 @@
 # Contributor:: Jesse Campbell (<hikeit@gmail.com>)
 # Contributor:: Bethany Erskine (<bethany@paperlesspost.com>)
 # Contributor:: Adrian Stanila (https://github.com/sacx)
+# Contributor:: Ryan Hass (rhass@chef.io)
 # License:: Apache License, Version 2.0
 #
 
@@ -13,6 +14,7 @@ require 'netaddr'
 require 'securerandom'
 require 'chef/knife/winrm_base'
 require 'chef/knife/customization_helper'
+require 'ipaddr'
 
 # Clone an existing template into a new VM, optionally applying a customization specification.
 # usage:
@@ -282,6 +284,16 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          description: 'Wait TIMEOUT seconds for sysprep event before continuing with bootstrap',
          default: 600
 
+  option :bootstrap_nic,
+         long: '--bootstrap-nic INTEGER',
+         description: 'Network interface to use when multiple NICs are defined on a template.',
+         default: 0
+
+  option :bootstrap_ipv4,
+         long: '--bootstrap-ipv4',
+         description: 'Force using an IPv4 address when a NIC has both IPv4 and IPv6 addresses.',
+         default: false
+
   def run
     $stdout.sync = true
 
@@ -332,9 +344,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
 
     return unless get_config(:bootstrap)
-    sleep 2 until vm.guest.ipAddress
 
-    connect_host = config[:fqdn] = config[:fqdn] ? get_config(:fqdn) : vm.guest.ipAddress
+    connect_host = guest_address(vm)
     Chef::Log.debug("Connect Host for Bootstrap: #{connect_host}")
     connect_port = get_config(:ssh_port)
     protocol = get_config(:bootstrap_protocol)
@@ -347,8 +358,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         puts 'Waiting for customization to complete...'
         CustomizationHelper.wait_for_sysprep(vm, vim, Integer(get_config(:sysprep_timeout)), 10)
         puts 'Customization Complete'
-        sleep 2 until vm.guest.ipAddress
-        connect_host = config[:fqdn] = config[:fqdn] ? get_config(:fqdn) : vm.guest.ipAddress
       end
       wait_for_access(connect_host, connect_port, protocol)
       ssh_override_winrm
@@ -361,6 +370,33 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
   end
 
+  def ipv4_address(vm)
+    puts 'Waiting for a valid IPv4 address...'
+    # Multiple reboots occur during guest customization in which a link-local
+    # address is assigned. As such, we need to wait until a routable IP address
+    # becomes available. This is most commonly an issue with Windows instances.
+    sleep 2 while vm.guest.net[config[:bootstrap_nic]].ipConfig.ipAddress.detect { |addr| IPAddr.new(addr.ipAddress).ipv4? }.origin == 'linklayer'
+    vm.guest.net[config[:bootstrap_nic]].ipAddress.detect { |addr| IPAddr.new(addr).ipv4? }
+  end
+
+  def guest_address(vm)
+    puts 'Waiting for network interfaces to become available...'
+    sleep 2 while vm.guest.net.empty? && !vm.guest.ipAddress
+    guest_address ||=
+      config[:fqdn] = if config[:bootstrap_ipv4]
+                        ipv4_address(vm)
+                      elsif config[:fqdn]
+                        get_config(:fqdn)
+                      else
+                        # Use the first IP which is not a link-local address.
+                        # This is the closest thing to vm.guest.ipAddress but
+                        # allows specifying a NIC.
+                        vm.guest.net[config[:bootstrap_nic]].ipConfig.ipAddress.detect do |addr|
+                          addr.origin != 'linklayer'
+                        end.ipAddress
+                      end
+  end
+
   def wait_for_access(connect_host, connect_port, protocol)
     if protocol == 'winrm'
       load_winrm_deps

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.10'
+  VERSION = '1.2.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize