clc-chef-metal-vsphere 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d464aa0043a0be506299d2fb8a26d16bb7eb917b
-  data.tar.gz: f2d96205badcfac32a1fbabace096f98e9dcef6e
+  metadata.gz: 3b0c4dd9dae64818686e099b41f1cb311f6c881f
+  data.tar.gz: 7be6d68e6ef5a3621130d58b6226ecd3accd60d0
 SHA512:
-  metadata.gz: 923c9de0efdd6076810b7b485a465be341cadb4cf53c1d849f50dd8f0ef58ef88c8a62e1bc2fbaf34163d50f18469c230f100bf4e551ccf4a805534e59344936
-  data.tar.gz: b8c024e18c2f2199e944f5d0706efa06c57c31236f1a397d5721f9a11f3a8361a35312bbc7c48becce019707938be7a01a4781cfc1b1b283cb36a2dc485a5864
+  metadata.gz: 22ede6ed4068081c171c9a1449434db54c3dfa07253e4c0fe76e1b2e280cdb79ef097be028ca10d090c2f01682fa42e297934d1c8c8cae51abb7e1a507e43aa9
+  data.tar.gz: be3b6fb95e507a4f433d5a94c5c4fca0cd83eeb2c22dba97b8cb0d68762394e04f965051c74315319982414760b02a53f0e8fec3d2059b2f96f97fab02ac3bd4

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.16'
+  VERSION = '0.3.17'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -434,7 +434,7 @@ module ChefMetalVsphere
 
     def wait_for_transport(action_handler, machine_spec, machine_options, vm)
       transport = transport_for(machine_spec, machine_options, vm)
-      if !transport.available?
+      if transport.nil? || !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) ..."
 
@@ -462,7 +462,8 @@ module ChefMetalVsphere
       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
+      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)
@@ -473,12 +474,18 @@ module ChefMetalVsphere
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       ssh_options = bootstrap_options[:ssh]
       ssh_user = ssh_options[:user]
-      remote_host = has_static_ip(bootstrap_options) ? bootstrap_options[:customization_spec][:ipsettings][:ip] : vm.guest.ipaddress
+      remote_host = ip_for(bootstrap_options, vm)
+      return if remote_host.nil?
 
       ChefMetal::Transport::SSH.new(remote_host, ssh_user, ssh_options, {}, config)
     end
+
+    def ip_for(bootstrap_options, vm)
+      if has_static_ip(bootstrap_options)
+        bootstrap_options[:customization_spec][:ipsettings][:ip]
+      elsif vm.guest.respond_to?('ipaddress')
+          vm.guest.ipaddress
+      end
+    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

@@ -118,7 +118,7 @@ module ChefMetalVsphere
         if(options[:customization_spec].is_a?(Hash))
             cust_options = options[:customization_spec]
             raise ArgumentError, "domain is required" unless cust_options.key?(:domain)
-            if cust_options.key?(:ipsettings)
+            if cust_options.key?(:ipsettings) and cust_options[:ipsettings].key?(:ip)
               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])

metadata

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