clc-chef-metal-vsphere 0.3.32 → 0.3.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd00184db58d16015203e91e92cd82447b24aa63
-  data.tar.gz: bbee8ee23bad1d04376dec8cc403db3dee9de282
+  metadata.gz: c386928597c16e1c09da241aaf74e2df8957da24
+  data.tar.gz: 9b0051985272d8b4852ce3f3b9b2ea62350621d2
 SHA512:
-  metadata.gz: 7318e5f4c4337a04ebe0984549c1acc21a9601db4ece5f81d68d3d6abcb05d851a3febd30e3ea93ddb296e1ecd852fd63402b4be4ccb1e5bfde2a61df05cd7eb
-  data.tar.gz: 9674cd6581201e306b7d77dab530dc9c445260c71a7d7ed4fd14922c4c9c997bc007d087a2a5589c4313a21afe72473e4f20d52858f403be051f3b4a74cb4b03
+  metadata.gz: 1458e0af757009ed5e225294612f15457cdd8377b3319cd71738e175b64aacda93f3874e7868ff7aaba7513d81fd7f94187a21357546f8bf7092524655e68f56
+  data.tar.gz: 1f31bfe97a2fc544db9efad7934fb13d6960a363f98e8161588c3ecede4a0d1e933f1b4e47ae587aec6d3f5df6deec99580918c78223fb89522cb2ea5a940f57

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.32'
+  VERSION = '0.3.33'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -201,12 +201,12 @@ module ChefMetalVsphere
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
 
       transport = nil
-      if !ip_for(bootstrap_options, vm).nil?
-        vm_ip = ip_for(bootstrap_options, vm)
+      vm_ip = ip_for(bootstrap_options, vm)
+      if !vm_ip.nil?
         transport = transport_for(machine_spec, machine_options, vm)
       end
 
-      if transport.nil? || !transport.available?
+      if transport.nil? || !transport.available? || !(vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip)
         action_handler.report_progress "waiting up to #{machine_options[:ready_timeout]} seconds for customizations to complete and find #{vm_ip}"
         now = Time.now.utc
 
@@ -231,6 +231,18 @@ module ChefMetalVsphere
         action_handler.report_progress "IP address obtained: #{vm.guest.ipAddress}"
       end
 
+      domain = bootstrap_options[:customization_spec][:domain]
+      if vm.config.guestId.start_with?('win') && domain != 'local'
+        now = Time.now.utc
+        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"
+        until (Time.now.utc - now) > 30 || (vm.guest.hostName == expected_name) do
+          print "."
+          sleep 5
+        end
+      end
+
       begin
         wait_for_transport(action_handler, machine_spec, machine_options, vm)
       rescue Timeout::Error
@@ -251,6 +263,8 @@ module ChefMetalVsphere
         setup_ubuntu_dns(machine, bootstrap_options, machine_spec)
       end
 
+      add_extra_nic(action_handler, vm_template_for(bootstrap_options), bootstrap_options, vm)
+      
       machine
     end
 
@@ -392,17 +406,22 @@ module ChefMetalVsphere
     def clone_vm(action_handler, bootstrap_options)
       vm_name         = bootstrap_options[:name]
       datacenter      = bootstrap_options[:datacenter]
-      template_folder = bootstrap_options[:template_folder]
-      template_name   = bootstrap_options[:template_name]
 
       vm = find_vm(datacenter, bootstrap_options[:vm_folder], vm_name)
       return vm if vm
 
-      vm_template = find_vm(datacenter, template_folder, template_name) or raise("vSphere VM Template not found [#{template_folder}/#{template_name}]")
+      vm_template = vm_template_for(bootstrap_options)
 
       do_vm_clone(action_handler, datacenter, vm_template, vm_name, bootstrap_options)
     end
 
+    def vm_template_for(bootstrap_options)
+      datacenter      = bootstrap_options[:datacenter]
+      template_folder = bootstrap_options[:template_folder]
+      template_name   = bootstrap_options[:template_name]
+      find_vm(datacenter, template_folder, template_name) or raise("vSphere VM Template not found [#{template_folder}/#{template_name}]")
+    end
+
     def machine_for(machine_spec, machine_options, vm = nil)
       vm ||= vm_for(machine_spec)
       if !vm

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -96,7 +96,7 @@ module ChefMetalVsphere
         connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
           :allowGuestControl => true,
           :connected => true,
-          :startConnected => operation.value == 'edit')
+          :startConnected => true)
         device = RbVmomi::VIM::VirtualVmxnet3(
           :backing => nic_backing_info,
           :deviceInfo => RbVmomi::VIM::Description(:label => network_label, :summary => network_name),
@@ -149,15 +149,19 @@ module ChefMetalVsphere
       vm = find_vm(dc_name, options[:vm_folder], vm_name)
 
       unless options[:additional_disk_size_gb].nil?
-        deviceAdditions.push(virtual_disk_for(vm, options))
+        task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => [virtual_disk_for(vm, options)]))
+        task.wait_for_completion
       end
 
-      unless deviceAdditions.count == 0
+      vm
+    end
+
+    def add_extra_nic(action_handler, vm_template, options, vm)
+      deviceAdditions, changes = network_device_changes(action_handler, vm_template, options)
+      if deviceAdditions.count > 0
         task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => deviceAdditions))
         task.wait_for_completion
       end
-
-      vm
     end
 
     def relocate_spec_for(dc_name, vm_template, options)
@@ -171,7 +175,7 @@ module ChefMetalVsphere
         raise 'either :host or :resource_pool must be specified when cloning from a VM Template' if pool.nil?
       end
 
-      if options.has_key?(:use_linked_template)
+      if options.has_key?(:use_linked_clone)
         create_delta_disk(vm_template)
         rspec.diskMoveType = :moveChildMostDiskBacking
       else
@@ -179,7 +183,7 @@ module ChefMetalVsphere
           rspec.datastore = find_datastore(datacenter, options[:datastore])
         end
       end
-      
+
       rspec
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.32
+  version: 0.3.33
 platform: ruby
 authors:
 - CenturyLink Cloud