clc-chef-metal-vsphere 0.3.28 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eab8d45530d97723935fbff016c3c2a78b636eac
-  data.tar.gz: c020291ad24b259c2806e7fe4d38490c602b79c8
+  metadata.gz: 68d9eedf92290d646eed6336f14df0c8741ed80e
+  data.tar.gz: 82ab5a9f32eeeb89dd84b1084f83b054f4ae1c78
 SHA512:
-  metadata.gz: a20508230f9ceb55eb3fb8c592335695f4461117be38c2d1a94805281fcfe4c29dc1b26e19c264791536259d350e0d3f94d4ffbdb4fc4b5ddf098456f9453214
-  data.tar.gz: 2b3d6a20eaa4be358cdc7bd501a99375cb80e76ba331f4f6cce588ee32aba4bc4bbaa99cf63a4899536019850af431a20c8903a7df8fa565bdbc3ff821a1c1ef
+  metadata.gz: 7bba831e0b9f53578e8f2b4348af243ae611412cb4485871c1e97bbc349054faf357bd149bd819745662f1c9f18383b8d4efdeb596324b11e9f0233d1b03f838
+  data.tar.gz: aee793315ea55f4db94b7d465ecd199ae079d60da45230cc53a41ce04cf9f27ae9fd0274c648f92da763b0b763f2808227a408687414ab59861ef0dd111e2bc6

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.28'
+  VERSION = '0.3.29'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -169,7 +169,7 @@ module ChefMetalVsphere
       if vm
         Chef::Log.info "machine already created: #{bootstrap_options[:vm_folder]}/#{machine_spec.name}"
       else
-        vm = clone_vm(bootstrap_options)
+        vm = clone_vm(action_handler, bootstrap_options)
       end
 
       machine_spec.location = {
@@ -387,7 +387,7 @@ module ChefMetalVsphere
       bootstrap_options
     end
 
-    def clone_vm(bootstrap_options)
+    def clone_vm(action_handler, bootstrap_options)
       vm_name         = bootstrap_options[:name]
       datacenter      = bootstrap_options[:datacenter]
       template_folder = bootstrap_options[:template_folder]
@@ -398,7 +398,7 @@ module ChefMetalVsphere
 
       vm_template = find_vm(datacenter, template_folder, template_name) or raise("vSphere VM Template not found [#{template_folder}/#{template_name}]")
 
-      do_vm_clone(datacenter, vm_template, vm_name, bootstrap_options)
+      do_vm_clone(action_handler, datacenter, vm_template, vm_name, bootstrap_options)
     end
 
     def machine_for(machine_spec, machine_options, vm = nil)

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -96,7 +96,7 @@ module ChefMetalVsphere
         connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
           :allowGuestControl => true,
           :connected => true,
-          :startConnected => true)
+          :startConnected => operation.value == 'edit')
         device = RbVmomi::VIM::VirtualVmxnet3(
           :backing => nic_backing_info,
           :deviceInfo => RbVmomi::VIM::Description(:label => network_label, :summary => network_name),
@@ -111,7 +111,7 @@ module ChefMetalVsphere
       vm.config.hardware.device.select {|d| d.is_a?(RbVmomi::VIM::VirtualEthernetCard)}
     end
 
-    def do_vm_clone(dc_name, vm_template, vm_name, options)
+    def do_vm_clone(action_handler, dc_name, vm_template, vm_name, options)
       deviceAdditions = []
 
       clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
@@ -121,7 +121,7 @@ module ChefMetalVsphere
         config: RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
       )
 
-      clone_spec.customization = customization_options_from(vm_template, vm_name, options)
+      clone_spec.customization = customization_options_from(action_handler, vm_template, vm_name, options)
 
       unless options[:annotation].to_s.nil?
         clone_spec.config.annotation = options[:annotation]
@@ -136,7 +136,7 @@ module ChefMetalVsphere
       end
 
       unless options[:network_name].nil?
-        deviceAdditions, changes = network_device_changes(vm_template, options)
+        deviceAdditions, changes = network_device_changes(action_handler, vm_template, options)
         clone_spec.config.deviceChange = changes
       end
 
@@ -199,7 +199,7 @@ module ChefMetalVsphere
       )
     end
 
-    def network_device_changes(vm_template, options)
+    def network_device_changes(action_handler, vm_template, options)
       additions = []
       changes = []
       networks=options[:network_name]
@@ -214,13 +214,13 @@ module ChefMetalVsphere
         if card = cards.shift
           key = card.key
           operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
-          puts "changing template nic for #{networks[i]}"
+          action_handler.report_progress "changing template nic for #{networks[i]}"
           changes.push(
             network_adapter_for(operation, networks[i], "Network Adapter #{i+1}", key))
         else
           key = key + 1
           operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('add')
-          puts "will be adding nic for #{networks[i]}"
+          action_handler.report_progress "will be adding nic for #{networks[i]}"
           additions.push(
             network_adapter_for(operation, networks[i], "Network Adapter #{i+1}", key))
         end
@@ -233,7 +233,7 @@ module ChefMetalVsphere
         baseEntity.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"    
     end
 
-    def customization_options_from(vm_template, vm_name, options)
+    def customization_options_from(action_handler, vm_template, vm_name, options)
       if options.has_key?(:customization_spec)
         if(options[:customization_spec].is_a?(Hash))
             cust_options = options[:customization_spec]
@@ -243,12 +243,12 @@ module ChefMetalVsphere
               raise ArgumentError, "ip and subnetMask is required for static ip" unless cust_options[:ipsettings].key?(:ip) and
                                                                                         cust_options[:ipsettings].key?(:subnetMask)
               cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(cust_options[:ipsettings])
-              puts "customizing #{vm_name} with static IP #{cust_options[:ipsettings][:ip]}"
+              action_handler.report_progress "customizing #{vm_name} with static IP #{cust_options[:ipsettings][:ip]}"
               cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => cust_options[:ipsettings][:ip])
             end
             cust_domain = cust_options[:domain]
             if cust_ip_settings.nil?
-              puts "customizing #{vm_name} with dynamic IP"
+              action_handler.report_progress "customizing #{vm_name} with dynamic IP"
               cust_ip_settings= RbVmomi::VIM::CustomizationIPSettings.new(:ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
             end
 
@@ -261,7 +261,7 @@ module ChefMetalVsphere
             cust_timezone = cust_options[:time_zone]
 
             if vm_template.config.guestId.start_with?('win')
-              cust_prep = windows_prep_for(options, vm_name)
+              cust_prep = windows_prep_for(action_handler, options, vm_name)
             else
               cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
                 :domain => cust_domain,
@@ -280,7 +280,7 @@ module ChefMetalVsphere
       end
     end
 
-    def windows_prep_for(options, vm_name)
+    def windows_prep_for(action_handler, options, vm_name)
       cust_options = options[:customization_spec]
       cust_runonce = RbVmomi::VIM::CustomizationGuiRunOnce.new(
         :commandList => [
@@ -288,15 +288,27 @@ module ChefMetalVsphere
           'winrm set winrm/config/service/auth @{Basic="true"}',
           'winrm set winrm/config/service @{AllowUnencrypted="true"}',
           'shutdown -l'])
-      cust_id = RbVmomi::VIM::CustomizationIdentification.new(
-        :joinWorkgroup => 'WORKGROUP')
-      cust_password = RbVmomi::VIM::CustomizationPassword(
+
+      cust_login_password = RbVmomi::VIM::CustomizationPassword(
         :plainText => true,
         :value => options[:ssh][:password])
+      if cust_options.has_key?(:domain) and cust_options[:domain] != 'local'
+        cust_domain_password = RbVmomi::VIM::CustomizationPassword(
+          :plainText => true,
+          :value => cust_options[:domainAdminPassword])
+        cust_id = RbVmomi::VIM::CustomizationIdentification.new(
+          :joinDomain => cust_options[:domain],
+          :domainAdmin => cust_options[:domainAdmin],
+          :domainAdminPassword => cust_domain_password)
+        action_handler.report_progress "joining domain #{cust_options[:domain]} with user: #{cust_options[:domainAdmin]}"
+      else
+        cust_id = RbVmomi::VIM::CustomizationIdentification.new(
+          :joinWorkgroup => 'WORKGROUP')
+      end
       cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(
         :autoLogon => true,
         :autoLogonCount => 1,
-        :password => cust_password,
+        :password => cust_login_password,
         :timeZone => cust_options[:win_time_zone])
       cust_userdata = RbVmomi::VIM::CustomizationUserData.new(
         :computerName => hostname_from(cust_options, vm_name),

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -65,7 +65,14 @@ describe "vsphere_driver" do
 			expect(@vm.config.instanceUuid).to eq(@machine_spec.location['server_id'])
 		end
 		it "has the correct name" do
-			expect(@vm.config.name).to eq(@vm_name)
+	      	now = Time.now.utc
+	      	trimmed_name = @vm.config.guestId.start_with?('win') ? @vm_name.byteslice(0,15) : @vm_name
+	      	expected_name="#{trimmed_name}.#{@metal_config[:machine_options][:bootstrap_options][:customization_spec][:domain]}"
+	        until (Time.now.utc - now) > 30 || (@vm.guest.hostName == expected_name) do
+	          print "."
+	          sleep 5
+	        end
+			expect(@vm.guest.hostName).to eq(expected_name)
 		end
 		it "has the correct number of CPUs" do
 			expect(@vm.config.hardware.numCPU).to eq(@metal_config[:machine_options][:bootstrap_options][:num_cpus])

metadata

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