clc-chef-metal-vsphere 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3973ec40c03e9e71b584570340a4e430f0b8b4
-  data.tar.gz: 12a687f5c9dfa2077b7cf4bb03be9216c0e7bac6
+  metadata.gz: d16dbc6a25eb57abb89031a4454b2973333cb83e
+  data.tar.gz: 00eeaafca401e0718c7b37701652d3ed55159967
 SHA512:
-  metadata.gz: 24a97ca603387b32230d046440fe098b53d921a99e825a7779a2d648d69244f510013c5ba4a0fa642e3c7011b89b4d2bfeb12bcfc5740d573d6ee771ba328357
-  data.tar.gz: a8cdc223b72bb45763acb5a593b9c01f31156d38e3f502252a4b85ba40cf468a07bf1e0eb329b65518eb2d5d4e46904a201d92a0e27c76ebacae18e694020b47
+  metadata.gz: 2a2b0e545aca1dc66b78b5d63fc0e8a5244a973f42bcd359cc7a016df2b210f08833767b1ea8800fbde7342f4b77bc03e783d7cbe5abceac94e8520ec91374a9
+  data.tar.gz: d5d2f123bfd12d4b9c5eeab7473a9add9bf2d41515e2c8eae5668ca0a3aa729803a44a15c3ed5a1909b9c7d75f82127eaf3c25b1cd00801811627dab18035ebe

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.20'
+  VERSION = '0.3.21'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -205,16 +205,16 @@ module ChefMetalVsphere
       end
 
       if transport.nil? || !transport.available?
-        Chef::Log.info "waiting for customizations to complete"
+        action_handler.report_progress "waiting for customizations to complete"
         now = Time.now.utc
         until (Time.now.utc - now) > 45 || (!vm.guest.ipAddress.nil? && vm.guest.ipAddress.length > 0) do
           print "-"
           sleep 5
         end
         if vm.guest.ipAddress.nil? || vm.guest.ipAddress.length == 0
-          Chef::Log.info "rebooting..."
+          action_handler.report_progress "rebooting..."
           if vm.guest.toolsRunningStatus != "guestToolsRunning"
-            Chef::Log.info "tools have stopped. current power state is #{vm.runtime.powerState} and tools state is #{vm.toolsRunningStatus}. powering up server..."
+            action_handler.report_progress "tools have stopped. current power state is #{vm.runtime.powerState} and tools state is #{vm.toolsRunningStatus}. powering up server..."
             start_vm(vm)
           else
             restart_server(action_handler, machine_spec, vm)
@@ -225,6 +225,7 @@ module ChefMetalVsphere
             sleep 5
           end
         end
+        action_handler.report_progress "IP address obtained: #{vm.guest.ipAddress}"
       end
 
       begin
@@ -434,13 +435,8 @@ module ChefMetalVsphere
     end
 
     def wait_for_transport(action_handler, machine_spec, machine_options, vm)
-      begin
-        transport = transport_for(machine_spec, machine_options, vm)
-      rescue Exception => e
-        Chef::Log.warn "Unable to obtain transport: #{e}"
-      end
-
-      if transport.nil? || !transport.available?
+      transport = transport_for(machine_spec, machine_options, vm)
+      if !transport.available?
         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) ..."
 
@@ -469,7 +465,6 @@ module ChefMetalVsphere
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       ssh_options = bootstrap_options[:ssh]
       remote_host = ip_for(bootstrap_options, vm)
-      return if remote_host.nil?
       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)
@@ -481,7 +476,6 @@ module ChefMetalVsphere
       ssh_options = bootstrap_options[:ssh]
       ssh_user = ssh_options[:user]
       remote_host = ip_for(bootstrap_options, vm)
-      return if remote_host.nil?
 
       ChefMetal::Transport::SSH.new(remote_host, ssh_user, ssh_options, {}, config)
     end
@@ -489,8 +483,8 @@ module ChefMetalVsphere
     def ip_for(bootstrap_options, vm)
       if has_static_ip(bootstrap_options)
         bootstrap_options[:customization_spec][:ipsettings][:ip]
-      else vm.guest.respond_to?('ipaddress')
-          vm.guest.ipaddress
+      else
+          vm.guest.ipAddress
       end
     end
   end

data/spec/integration_tests/config.rb

@@ -27,7 +27,6 @@
 		  	:convergence_options => {},
 	        :customization_spec => {
 	          :ipsettings => {
-	            :ip => "172.21.20.196",
 	            :subnetMask => '255.255.255.0',
 	            :gateway => ["172.21.20.1"],
 	            :dnsServerList => ["172.17.1.26","172.17.1.27"]

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -39,6 +39,7 @@ describe "vsphere_driver" do
 
 	before :all do
 		@vm_name = "cmvd-test-#{SecureRandom.hex}"
+		#@vm_name = "cmvd-test-ee744c7bd5588f743c175dfc4100f172"
 		@metal_config = eval File.read(File.expand_path('../config.rb', __FILE__))
 		Cheffish.honor_local_mode do
 			chef_server = Cheffish.default_chef_server(@metal_config)

metadata

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