clc-chef-metal-vsphere 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af91c22e6628b4464932aa8e00c5bd8e98579d2
-  data.tar.gz: de6c8d8d4ba8b4598c47650f3d7efb1ec04492e9
+  metadata.gz: 004372fe9c9c3ad94b5e8dd7c0d586347fc6d67f
+  data.tar.gz: c9dc1936c513c02464381c88c2c4998fe296550e
 SHA512:
-  metadata.gz: 420b870bd00a8b10e8b680ffa6a54f008f7fcd31e205e3d4d2dd9343010aae55d71bf83d6cc9cbbfc18ff678cabbe9e32d80009268896015e51d0e28d1281212
-  data.tar.gz: c174befdfccf2787129d72c4823ca0e8c07cd31ee87bc33042ed0215e3d43963f151602bc0c6ae827b7b61ac0c82ae85e7f6a6ebbc75303842998f889bac8266
+  metadata.gz: 7006e23c8a7a3e86e0ceeda019a0f733c21e56aafad253d2ff57da20e62fe58d2539b37907c29bd6694d6dc26ca6ad9b14f3d585d3c2bff80fadb93bd72f2d8c
+  data.tar.gz: 645a05ada0ef6142e3ec88ae558aa89dbff9bac379fb296eb3969b60696f2ff45c9957762c6139b58881c159c3836683712e3164c21b367e4b9c848e686f5b31

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.18'
+  VERSION = '0.3.19'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -198,31 +198,28 @@ module ChefMetalVsphere
       wait_until_ready(action_handler, machine_spec, machine_options, vm)
 
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
-      is_static = false
-      if has_static_ip(bootstrap_options)
-        is_static = true
-        transport = transport_for(machine_spec, machine_options, vm)
-        if !transport.available?
-          Chef::Log.info "waiting for customizations to complete"
+
+      transport = transport_for(machine_spec, machine_options, vm)
+      if !transport.available?
+        Chef::Log.info "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..."
+          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..."
+            start_vm(vm)
+          else
+            restart_server(action_handler, machine_spec, vm)
+          end
           now = Time.now.utc
-          until (Time.now.utc - now) > 45 || (!vm.guest.ipAddress.nil? && vm.guest.ipAddress.length > 0) do
+          until (Time.now.utc - now) > 60 || (!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..."
-            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..."
-              start_vm(vm)
-            else
-              restart_server(action_handler, machine_spec, vm)
-            end
-            now = Time.now.utc
-            until (Time.now.utc - now) > 60 || (!vm.guest.ipAddress.nil? && vm.guest.ipAddress.length > 0) do
-              print "-"
-              sleep 5
-            end
-          end
         end
       end
 
@@ -242,7 +239,7 @@ module ChefMetalVsphere
 
       machine = machine_for(machine_spec, machine_options, vm)
 
-      if is_static && !is_windows?(vm)
+      if has_static_ip(bootstrap_options) && !is_windows?(vm)
         setup_ubuntu_dns(machine, bootstrap_options, machine_spec)
       end
 

metadata

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