clc-chef-metal-vsphere 0.3.33 → 0.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c386928597c16e1c09da241aaf74e2df8957da24
-  data.tar.gz: 9b0051985272d8b4852ce3f3b9b2ea62350621d2
+  metadata.gz: b75f04e739aacacdf87a879121fb781da3d7490d
+  data.tar.gz: 546c36a81fb1f1b9184db92c0a240ea7d7027a81
 SHA512:
-  metadata.gz: 1458e0af757009ed5e225294612f15457cdd8377b3319cd71738e175b64aacda93f3874e7868ff7aaba7513d81fd7f94187a21357546f8bf7092524655e68f56
-  data.tar.gz: 1f31bfe97a2fc544db9efad7934fb13d6960a363f98e8161588c3ecede4a0d1e933f1b4e47ae587aec6d3f5df6deec99580918c78223fb89522cb2ea5a940f57
+  metadata.gz: 5f198c590723cfd2a735d8754a51542fa94506e25adc1bcbcbdad85a2acd95e53b600fd1622d5693391602b60cd6cbd454c71670f599a44c33bff5cea8c93dab
+  data.tar.gz: 8e0f36370103e28d8b83203eb8deb31883e5e0ef3980dcf4f0997b80b75aacfd44fd18d7504db15a059149ce46646d4a989bf6d5308c9def7f3cffb179d07770

data/lib/chef_metal_vsphere/version.rb

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

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -236,13 +236,15 @@ module ChefMetalVsphere
         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"
+        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
 
+      add_extra_nic(action_handler, vm_template_for(bootstrap_options), bootstrap_options, vm)
+
       begin
         wait_for_transport(action_handler, machine_spec, machine_options, vm)
       rescue Timeout::Error
@@ -263,8 +265,6 @@ 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
 
@@ -462,8 +462,6 @@ module ChefMetalVsphere
         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) ..."
 
-          _self = self
-
           until remaining_wait_time(machine_spec, machine_options) < 0 || transport.available? do
             print "."
             sleep 5

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -158,9 +158,16 @@ module ChefMetalVsphere
 
     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
+        current_networks = find_ethernet_cards_for(vm).map{|card| card.backing.deviceName}
+        new_devices = deviceAdditions.select { |device| !current_networks.include?(device.device.backing.deviceName)}
+        
+        if new_devices.count > 0
+          action_handler.report_progress "Adding extra NICs"
+          task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => new_devices))
+          task.wait_for_completion
+        end
       end
     end
 

metadata

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