clc-chef-metal-vsphere 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f96f40dfe5a341ed4d8522ba979e119beee05d8
-  data.tar.gz: 309ae1f3c2b8497d5e06b8de5d235b33a0df8fe3
+  metadata.gz: bde0ea1b5590a556f8290d449c971aa42fb9195d
+  data.tar.gz: 247666cc1e8e51729208999304b10478b548d6aa
 SHA512:
-  metadata.gz: 195eaa0939fa86f6d9645ca059af7018d2be23558bee8800c8d82309d3756218b5b9707377be33cf600bd6cb4f5931c713a3c7284ab65d7a61c029189e8bf866
-  data.tar.gz: 2114bee171e8830c150da96241be21efd95874490656b7a278d41534838fdfe38118690a8a10f044ab64dc699481e6080b2bcb13f9de35c01024e9601f02852a
+  metadata.gz: 1a7e0aaef059608389aa13a78a46593bbe49198c7d4653dd6f0913a2da40c9948c802894696d62705d5b14e3121cd17e11bad30a628a8aefa3c4a4fcc3c90110
+  data.tar.gz: 09e2bd807f626dda10d1694b5f844ac8603c117be80725f6db402054e8d31320800056464b45e70fcd13bc487074c826ad02995ba16bf57a8db2422719e04092

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -243,29 +243,8 @@ module ChefMetalVsphere
 
       machine = machine_for(machine_spec, machine_options, vm)
 
-      if is_static
-        host_lookup = machine.execute_always('host google.com')
-        if host_lookup.exitstatus != 0
-          if host_lookup.stdout.include?("setlocale: LC_ALL")
-            machine.execute_always('locale-gen en_US && update-locale LANG=en_US')
-          end
-          distro = machine.execute_always("lsb_release -i | sed -e 's/Distributor ID://g'").stdout.strip
-          Chef::Log.info "Found distro:#{distro}"
-          if distro == 'Ubuntu'
-            distro_version = (machine.execute_always("lsb_release -r | sed -e s/[^0-9.]//g")).stdout.strip.to_f
-            Chef::Log.info "Found distro version:#{distro_version}"
-            if distro_version>= 12.04
-              Chef::Log.info "Ubuntu version 12.04 or greater. Need to patch DNS."
-              interfaces_file = "/etc/network/interfaces"
-              nameservers = bootstrap_options[:customization_spec][:ipsettings][:dnsServerList].join(' ')
-              machine.execute_always("if ! cat #{interfaces_file} | grep -q dns-search ; then echo 'dns-search #{machine_spec.name}' >> #{interfaces_file} ; fi")
-              machine.execute_always("if ! cat #{interfaces_file} | grep -q dns-nameservers ; then echo 'dns-nameservers #{nameservers}' >> #{interfaces_file} ; fi")
-              machine.execute_always('/etc/init.d/networking restart')
-              machine.execute_always('echo "ACTION=="add", SUBSYSTEM=="cpu", ATTR{online}="1"" > /etc/udev/rules.d/99-vmware-cpuhotplug-udev.rules')
-              machine.execute_always('apt-get -qq update')
-            end
-          end
-        end
+      if is_static && !is_windows?(vm)
+        setup_ubuntu_dns(machine, bootstrap_options, machine_spec)
       end
 
       machine
@@ -322,6 +301,31 @@ module ChefMetalVsphere
 
     protected
 
+    def setup_ubuntu_dns(machine, bootstrap_options, machine_spec)
+        host_lookup = machine.execute_always('host google.com')
+        if host_lookup.exitstatus != 0
+          if host_lookup.stdout.include?("setlocale: LC_ALL")
+            machine.execute_always('locale-gen en_US && update-locale LANG=en_US')
+          end
+          distro = machine.execute_always("lsb_release -i | sed -e 's/Distributor ID://g'").stdout.strip
+          Chef::Log.info "Found distro:#{distro}"
+          if distro == 'Ubuntu'
+            distro_version = (machine.execute_always("lsb_release -r | sed -e s/[^0-9.]//g")).stdout.strip.to_f
+            Chef::Log.info "Found distro version:#{distro_version}"
+            if distro_version>= 12.04
+              Chef::Log.info "Ubuntu version 12.04 or greater. Need to patch DNS."
+              interfaces_file = "/etc/network/interfaces"
+              nameservers = bootstrap_options[:customization_spec][:ipsettings][:dnsServerList].join(' ')
+              machine.execute_always("if ! cat #{interfaces_file} | grep -q dns-search ; then echo 'dns-search #{machine_spec.name}' >> #{interfaces_file} ; fi")
+              machine.execute_always("if ! cat #{interfaces_file} | grep -q dns-nameservers ; then echo 'dns-nameservers #{nameservers}' >> #{interfaces_file} ; fi")
+              machine.execute_always('/etc/init.d/networking restart')
+              machine.execute_always('echo "ACTION=="add", SUBSYSTEM=="cpu", ATTR{online}="1"" > /etc/udev/rules.d/99-vmware-cpuhotplug-udev.rules')
+              machine.execute_always('apt-get -qq update')
+            end
+          end
+        end
+    end
+
     def has_static_ip(bootstrap_options)
       if bootstrap_options.has_key?(:customization_spec)
         bootstrap_options = bootstrap_options[:customization_spec]
@@ -456,7 +460,13 @@ module ChefMetalVsphere
     end
 
     def create_winrm_transport(machine_spec, machine_options, vm)
-      raise 'Windows guest VMs are not yet supported'
+      require 'chef_metal/transport/winrm'
+      bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
+      ssh_options = bootstrap_options[:ssh]
+      remote_host = has_static_ip(bootstrap_options) ? bootstrap_options[:customization_spec][:ipsettings][:ip] : vm.guest.ipaddress
+      winrm_options = {:user => "#{remote_host}\\#{ssh_options[:user]}", :pass => ssh_options[:password], :disable_sspi => true}
+
+      ChefMetal::Transport::WinRM.new("http://#{remote_host}:5985/wsman", :plaintext, winrm_options, config)
     end
 
     def create_ssh_transport(machine_spec, machine_options, vm)
@@ -470,3 +480,6 @@ module ChefMetalVsphere
     end
   end
 end
+
+
+# wr=WinRM::WinRMWebService.new('http://172.21.20.196:5985/wsman', :plaintext, {:user => "cmvd-test-41f91\\Administrator", :pass => 'Password123', :basic_auth_only => true})

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -75,7 +75,6 @@ module ChefMetalVsphere
 
     #folder could be like:  /Level1/Level2/folder_name
     def find_folder(dc_name, folder_name)
-      #dc(dc_name).vmFolder.childEntity.grep(RbVmomi::VIM::Folder).find { |x| x.name == folder_name }
       baseEntity = dc(dc_name).vmFolder
       if folder_name && folder_name.length > 0
         entityArray = folder_name.split('/')
@@ -135,16 +134,46 @@ module ChefMetalVsphere
             cust_hostname ||= RbVmomi::VIM::CustomizationFixedName.new(:name => vm_name)
             cust_hwclockutc = cust_options[:hw_clock_utc]
             cust_timezone = cust_options[:time_zone]
-            cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
-              :domain => cust_domain,
-              :hostName => cust_hostname,
-              :hwClockUTC => cust_hwclockutc,
-              :timeZone => cust_timezone)
-            cust_adapter_mapping = [RbVmomi::VIM::CustomizationAdapterMapping.new(:adapter => cust_ip_settings)]
-            cust_spec = RbVmomi::VIM::CustomizationSpec.new(
-              :identity => cust_prep,
-              :globalIPSettings => cust_global_ip_settings,
-              :nicSettingMap => cust_adapter_mapping)
+
+            if vm_template.guest.guestId.start_with?('win')
+              cust_runonce = RbVmomi::VIM::CustomizationGuiRunOnce.new(
+                :commandList => [
+                  'winrm set winrm/config/client/auth @{Basic="true"}',
+                  '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(
+                :plainText => true,
+                :value => options[:ssh][:password])
+              cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(
+                :autoLogon => true,
+                :autoLogonCount => 1,
+                :password => cust_password,
+                :timeZone => cust_options[:win_time_zone])
+              cust_userdata = RbVmomi::VIM::CustomizationUserData.new(
+                :computerName => cust_hostname,
+                :fullName => cust_options[:org_name],
+                :orgName => cust_options[:org_name],
+                :productId => cust_options[:product_id])
+              cust_prep = RbVmomi::VIM::CustomizationSysprep.new(
+                :guiRunOnce => cust_runonce,
+                :identification => cust_id,
+                :guiUnattended => cust_gui_unattended,
+                :userData => cust_userdata)
+            else
+              cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
+                :domain => cust_domain,
+                :hostName => cust_hostname,
+                :hwClockUTC => cust_hwclockutc,
+                :timeZone => cust_timezone)
+            end
+              cust_adapter_mapping = [RbVmomi::VIM::CustomizationAdapterMapping.new(:adapter => cust_ip_settings)]
+              cust_spec = RbVmomi::VIM::CustomizationSpec.new(
+                :identity => cust_prep,
+                :globalIPSettings => cust_global_ip_settings,
+                :nicSettingMap => cust_adapter_mapping)
         else
           cust_spec = find_customization_spec(options[:customization_spec])
         end
@@ -170,7 +199,7 @@ module ChefMetalVsphere
           :allowGuestControl => true,
           :connected => true,
           :startConnected => true)
-        device = RbVmomi::VIM::VirtualE1000(
+        device = RbVmomi::VIM::VirtualVmxnet3(
           :backing => nic_backing_info,
           :deviceInfo => RbVmomi::VIM::Description(:label => "Network adapter 1", :summary => options[:network_name]),
           :key => 4000,

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -38,7 +38,8 @@ describe "vsphere_driver" do
     include ChefMetalVsphere::Helpers
 
 	before :all do
-		@vm_name = "cmvd-test-#{SecureRandom.hex}"
+		#@vm_name = "cmvd-test-#{SecureRandom.hex}"
+		@vm_name = "cmvd-test-41f91ed95145ffabc045df653b69ef1d"
 		@metal_config = eval File.read(File.expand_path('../config.rb', __FILE__))
 		Cheffish.honor_local_mode do
 			chef_server = Cheffish.default_chef_server(@metal_config)
@@ -48,8 +49,11 @@ describe "vsphere_driver" do
 			action_handler = ChefMetal::ActionHandler.new
 			@driver.allocate_machine(action_handler, @machine_spec, @metal_config[:machine_options])
 			@metal_config[:machine_options][:convergence_options] = {:chef_server => chef_server}
-			@driver.ready_machine(action_handler, @machine_spec, @metal_config[:machine_options])
+			machine = @driver.ready_machine(action_handler, @machine_spec, @metal_config[:machine_options])
 			@server_id = @machine_spec.location['server_id']
+			machine.setup_convergence(action_handler)
+			@machine_spec.save(action_handler)
+			machine.converge(action_handler)
 			@connection = vim(@metal_config[:driver_options])
 			@vm = find_vm_by_id(@server_id, @connection)
 		end
@@ -113,20 +117,20 @@ describe "vsphere_driver" do
 		end
     end
 
-	context "destroy_machine" do
+	# context "destroy_machine" do
 
-		it "removes the machine" do
-			Cheffish.honor_local_mode do
-				chef_server = Cheffish.default_chef_server(@metal_config)
-				driver = ChefMetal.driver_for_url("vsphere://#{@metal_config[:driver_options][:host]}", @metal_config)
-				action_handler = ChefMetal::ActionHandler.new
-				machine_spec = ChefMetal::ChefMachineSpec.new({'name' => @vm_name}, chef_server)
-				machine_spec.location = { 'driver_url' => driver.driver_url,
-										  'server_id' => @server_id}
-				driver.destroy_machine(action_handler, machine_spec, @metal_config[:machine_options])
-			end
-			vm = find_vm_by_id(@server_id, @connection)
-			expect(vm).to eq(nil)
-		end
-	end
+	# 	it "removes the machine" do
+	# 		Cheffish.honor_local_mode do
+	# 			chef_server = Cheffish.default_chef_server(@metal_config)
+	# 			driver = ChefMetal.driver_for_url("vsphere://#{@metal_config[:driver_options][:host]}", @metal_config)
+	# 			action_handler = ChefMetal::ActionHandler.new
+	# 			machine_spec = ChefMetal::ChefMachineSpec.new({'name' => @vm_name}, chef_server)
+	# 			machine_spec.location = { 'driver_url' => driver.driver_url,
+	# 									  'server_id' => @server_id}
+	# 			driver.destroy_machine(action_handler, machine_spec, @metal_config[:machine_options])
+	# 		end
+	# 		vm = find_vm_by_id(@server_id, @connection)
+	# 		expect(vm).to eq(nil)
+	# 	end
+	# end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: chef-metal
+  name: clc-fork-chef-metal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.1.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.1.alpha.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement