clc-chef-metal-vsphere 0.3.35 → 0.3.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5627aeaa0a06bba6e555a0f325790cf894306987
-  data.tar.gz: 867a9b91f2392932f6af5f9c918205391bdcb042
+  metadata.gz: 738fda0ee5a8377349e3823f4c893a1e4e610f3d
+  data.tar.gz: 3b0bc2bfaa0ebf2a23d698139a9a6ea6e27d152f
 SHA512:
-  metadata.gz: 7a5b1709b40b063ad346668efd08266f4735b196e149b276f188256bba0def7b7bdc6016031bd816dbfc73afd4e678ee3587c4df1d0527cb5d452a672a507973
-  data.tar.gz: 58887a83db84397eb05deeb6a6a241e61b56edd92ff7bf35939c7327e8bfcc5a6b3835f65f8026cef91464b5e4d4e1e831f28c0806d28fe447ded7da52de96fa
+  metadata.gz: d4453f11db5172b1fd720d67a5e86e2bfe441020cf9dda66d9d74f31033c63cf81fd2b5eba56c821146a027556d5c1346d14c1d38fc93e4195cd72b41c1c4609
+  data.tar.gz: 76a8092cc0218fb18252c3baa1f221dfb369fd827b8756b02823627e2c2c833d443e3878194dc15abf1a83ab17c3adaf3072c9a7f723ffeb137aca12a23accaf

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.35'
+  VERSION = '0.3.36'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -243,8 +243,6 @@ module ChefMetalVsphere
         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
@@ -261,6 +259,13 @@ module ChefMetalVsphere
 
       machine = machine_for(machine_spec, machine_options, vm)
 
+      new_nics = add_extra_nic(action_handler, vm_template_for(bootstrap_options), bootstrap_options, vm)
+      if is_windows?(vm) && !new_nics.nil?
+        new_nics.each do |nic|
+          machine.execute_always("Disable-Netadapter -Name '#{nic.device.deviceInfo.label}' -Confirm:$false")
+        end
+      end
+
       if has_static_ip(bootstrap_options) && !is_windows?(vm)
         setup_ubuntu_dns(machine, bootstrap_options, machine_spec)
       end
@@ -485,7 +490,7 @@ module ChefMetalVsphere
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       ssh_options = bootstrap_options[:ssh]
       remote_host = ip_for(bootstrap_options, vm)
-      winrm_options = {:user => "#{remote_host}\\#{ssh_options[:user]}", :pass => ssh_options[:password], :basic_auth_only => true}
+      winrm_options = {:user => "#{ssh_options[:user]}", :pass => ssh_options[:password], :basic_auth_only => true}
 
       ChefMetal::Transport::WinRM.new("http://#{remote_host}:5985/wsman", :plaintext, winrm_options, config)
     end

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -167,6 +167,7 @@ module ChefMetalVsphere
           action_handler.report_progress "Adding extra NICs"
           task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => new_devices))
           task.wait_for_completion
+          new_devices
         end
       end
     end
@@ -252,18 +253,19 @@ module ChefMetalVsphere
 
       key = 4000
       networks.each_index do | i |
+        label = "Ethernet #{i+1}"
         if card = cards.shift
           key = card.key
           operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
           action_handler.report_progress "changing template nic for #{networks[i]}"
           changes.push(
-            network_adapter_for(operation, networks[i], "Network Adapter #{i+1}", key))
+            network_adapter_for(operation, networks[i], label, key))
         else
           key = key + 1
           operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('add')
           action_handler.report_progress "will be adding nic for #{networks[i]}"
           additions.push(
-            network_adapter_for(operation, networks[i], "Network Adapter #{i+1}", key))
+            network_adapter_for(operation, networks[i], label, key))
         end
       end
       [additions, changes]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.35
+  version: 0.3.36
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef