clc-chef-metal-vsphere 0.3.19 → 0.3.20
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 -3
- 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: 4c3973ec40c03e9e71b584570340a4e430f0b8b4
|
4
|
+
data.tar.gz: 12a687f5c9dfa2077b7cf4bb03be9216c0e7bac6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 24a97ca603387b32230d046440fe098b53d921a99e825a7779a2d648d69244f510013c5ba4a0fa642e3c7011b89b4d2bfeb12bcfc5740d573d6ee771ba328357
|
7
|
+
data.tar.gz: a8cdc223b72bb45763acb5a593b9c01f31156d38e3f502252a4b85ba40cf468a07bf1e0eb329b65518eb2d5d4e46904a201d92a0e27c76ebacae18e694020b47
|
@@ -199,8 +199,12 @@ module ChefMetalVsphere
|
|
199
199
|
|
200
200
|
bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
|
201
201
|
|
202
|
-
transport =
|
203
|
-
if !
|
202
|
+
transport = nil
|
203
|
+
if !ip_for(bootstrap_options, vm).nil?
|
204
|
+
transport = transport_for(machine_spec, machine_options, vm)
|
205
|
+
end
|
206
|
+
|
207
|
+
if transport.nil? || !transport.available?
|
204
208
|
Chef::Log.info "waiting for customizations to complete"
|
205
209
|
now = Time.now.utc
|
206
210
|
until (Time.now.utc - now) > 45 || (!vm.guest.ipAddress.nil? && vm.guest.ipAddress.length > 0) do
|
@@ -485,7 +489,7 @@ module ChefMetalVsphere
|
|
485
489
|
def ip_for(bootstrap_options, vm)
|
486
490
|
if has_static_ip(bootstrap_options)
|
487
491
|
bootstrap_options[:customization_spec][:ipsettings][:ip]
|
488
|
-
else
|
492
|
+
else vm.guest.respond_to?('ipaddress')
|
489
493
|
vm.guest.ipaddress
|
490
494
|
end
|
491
495
|
end
|