clc-chef-metal-vsphere 0.3.17 → 0.3.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/chef_metal_vsphere/version.rb +1 -1
- data/lib/chef_metal_vsphere/vsphere_driver.rb +7 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1af91c22e6628b4464932aa8e00c5bd8e98579d2
|
4
|
+
data.tar.gz: de6c8d8d4ba8b4598c47650f3d7efb1ec04492e9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 420b870bd00a8b10e8b680ffa6a54f008f7fcd31e205e3d4d2dd9343010aae55d71bf83d6cc9cbbfc18ff678cabbe9e32d80009268896015e51d0e28d1281212
|
7
|
+
data.tar.gz: c174befdfccf2787129d72c4823ca0e8c07cd31ee87bc33042ed0215e3d43963f151602bc0c6ae827b7b61ac0c82ae85e7f6a6ebbc75303842998f889bac8266
|
@@ -433,7 +433,12 @@ module ChefMetalVsphere
|
|
433
433
|
end
|
434
434
|
|
435
435
|
def wait_for_transport(action_handler, machine_spec, machine_options, vm)
|
436
|
-
|
436
|
+
begin
|
437
|
+
transport = transport_for(machine_spec, machine_options, vm)
|
438
|
+
rescue Exception => e
|
439
|
+
Chef::Log.warn "Unable to obtain transport: #{e}"
|
440
|
+
end
|
441
|
+
|
437
442
|
if transport.nil? || !transport.available?
|
438
443
|
if action_handler.should_perform_actions
|
439
444
|
action_handler.report_progress "waiting for #{machine_spec.name} (#{vm.config.instanceUuid} on #{driver_url}) to be connectable (transport up and running) ..."
|
@@ -483,7 +488,7 @@ module ChefMetalVsphere
|
|
483
488
|
def ip_for(bootstrap_options, vm)
|
484
489
|
if has_static_ip(bootstrap_options)
|
485
490
|
bootstrap_options[:customization_spec][:ipsettings][:ip]
|
486
|
-
|
491
|
+
else
|
487
492
|
vm.guest.ipaddress
|
488
493
|
end
|
489
494
|
end
|